| Message ID | 6d9de720-afd1-c5a9-75fc-460c721ce75f@googlemail.com |
|---|---|
| State | Accepted |
| Commit | 719c15aa9ad6983200b78e5dbc17443f649c8af9 |
| Headers | show |
On 11/1/2016 1:42 PM, Andreas Cadhalpun wrote: > Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> > --- > > To be applied after the fix. > > --- > > tests/lavf-regression.sh | 3 +++ > tests/ref/lavf/apng | 3 +++ > 2 files changed, 6 insertions(+) > > diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh > index 941f4d1..12954d5 100755 > --- a/tests/lavf-regression.sh > +++ b/tests/lavf-regression.sh > @@ -216,6 +216,9 @@ if [ -n "$do_apng" ] ; then > file=${outfile}lavf.apng > do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -pix_fmt rgb24 > do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 > +file_copy=${outfile}lavf.copy.apng > +do_avconv $file_copy $DEC_OPTS -i $file $ENC_OPTS -c copy > +do_avconv_crc $file_copy $DEC_OPTS -i $target_path/$file_copy > file=${outfile}lavf.png > do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt rgb24 -frames:v 1 -f apng > do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 > diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng > index 4d35408..8e9e5e6 100644 > --- a/tests/ref/lavf/apng > +++ b/tests/ref/lavf/apng > @@ -1,6 +1,9 @@ > a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.apng > 6209864 ./tests/data/lavf/lavf.apng > ./tests/data/lavf/lavf.apng CRC=0x87b3c15f > +a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.copy.apng > +6209864 ./tests/data/lavf/lavf.copy.apng > +./tests/data/lavf/lavf.copy.apng CRC=0x87b3c15f > c5900fdd1b2fc30b985793f5226fd0c4 *./tests/data/lavf/lavf.png > 248854 ./tests/data/lavf/lavf.png > ./tests/data/lavf/lavf.png CRC=0xd8c7b7a1 LGTM, thanks.
On 01.11.2016 18:27, James Almer wrote: > On 11/1/2016 1:42 PM, Andreas Cadhalpun wrote: >> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> >> --- >> >> To be applied after the fix. >> >> --- >> >> tests/lavf-regression.sh | 3 +++ >> tests/ref/lavf/apng | 3 +++ >> 2 files changed, 6 insertions(+) >> >> diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh >> index 941f4d1..12954d5 100755 >> --- a/tests/lavf-regression.sh >> +++ b/tests/lavf-regression.sh >> @@ -216,6 +216,9 @@ if [ -n "$do_apng" ] ; then >> file=${outfile}lavf.apng >> do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -pix_fmt rgb24 >> do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 >> +file_copy=${outfile}lavf.copy.apng >> +do_avconv $file_copy $DEC_OPTS -i $file $ENC_OPTS -c copy >> +do_avconv_crc $file_copy $DEC_OPTS -i $target_path/$file_copy >> file=${outfile}lavf.png >> do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt rgb24 -frames:v 1 -f apng >> do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 >> diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng >> index 4d35408..8e9e5e6 100644 >> --- a/tests/ref/lavf/apng >> +++ b/tests/ref/lavf/apng >> @@ -1,6 +1,9 @@ >> a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.apng >> 6209864 ./tests/data/lavf/lavf.apng >> ./tests/data/lavf/lavf.apng CRC=0x87b3c15f >> +a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.copy.apng >> +6209864 ./tests/data/lavf/lavf.copy.apng >> +./tests/data/lavf/lavf.copy.apng CRC=0x87b3c15f >> c5900fdd1b2fc30b985793f5226fd0c4 *./tests/data/lavf/lavf.png >> 248854 ./tests/data/lavf/lavf.png >> ./tests/data/lavf/lavf.png CRC=0xd8c7b7a1 > > LGTM, thanks. Pushed. Best regards, Andreas
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 941f4d1..12954d5 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -216,6 +216,9 @@ if [ -n "$do_apng" ] ; then file=${outfile}lavf.apng do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -pix_fmt rgb24 do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 +file_copy=${outfile}lavf.copy.apng +do_avconv $file_copy $DEC_OPTS -i $file $ENC_OPTS -c copy +do_avconv_crc $file_copy $DEC_OPTS -i $target_path/$file_copy file=${outfile}lavf.png do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt rgb24 -frames:v 1 -f apng do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng index 4d35408..8e9e5e6 100644 --- a/tests/ref/lavf/apng +++ b/tests/ref/lavf/apng @@ -1,6 +1,9 @@ a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.apng 6209864 ./tests/data/lavf/lavf.apng ./tests/data/lavf/lavf.apng CRC=0x87b3c15f +a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.copy.apng +6209864 ./tests/data/lavf/lavf.copy.apng +./tests/data/lavf/lavf.copy.apng CRC=0x87b3c15f c5900fdd1b2fc30b985793f5226fd0c4 *./tests/data/lavf/lavf.png 248854 ./tests/data/lavf/lavf.png ./tests/data/lavf/lavf.png CRC=0xd8c7b7a1
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> --- To be applied after the fix. --- tests/lavf-regression.sh | 3 +++ tests/ref/lavf/apng | 3 +++ 2 files changed, 6 insertions(+)