diff options
| author | James Almer <jamrial@gmail.com> | 2016-11-18 12:08:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-11-18 12:24:28 -0300 |
| commit | 16c429166ddf1736972b6ccce84bd3509ec16a34 (patch) | |
| tree | b5fa37093ea51d64cdf89e0a3f783d3720a62a32 /tests | |
| parent | 127cc6dd3d0b8ce8875aecacc5c2aaf45bf52243 (diff) | |
| download | ffmpeg-16c429166ddf1736972b6ccce84bd3509ec16a34.tar.gz | |
Revert "apngdec: use side data to pass extradata to the decoder"
This reverts commit e0c6b32046f4bab7d34be77dd2f03b2a80c86d39.
Said commit changed the behavior of the demuxer and decoder in a non
backwards compatible way.
Demuxers should make extradata available at init if possible, and send
new extradata as side data within a packet if needed.
A better fix for the remuxing crash will follow.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavf-regression.sh | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/apng | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 12954d5044..e47be1854b 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -216,9 +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_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 8e9e5e6b73..4d354089ab 100644 --- a/tests/ref/lavf/apng +++ b/tests/ref/lavf/apng @@ -1,9 +1,6 @@ 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 |