diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:06:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:06:30 +0100 |
| commit | 771919e11fcdf6fb518c04d55b83fb3e50c35a58 (patch) | |
| tree | b62c39a60e32e81665830b97c139ac7e14bacd10 | |
| parent | 49e87819d09e4c7a7bbbfa19dff12c2d0db29584 (diff) | |
| parent | 6deae8e0530a885b76f149841ed4899cb438ec23 (diff) | |
| download | ffmpeg-771919e11fcdf6fb518c04d55b83fb3e50c35a58.tar.gz | |
Merge commit '6deae8e0530a885b76f149841ed4899cb438ec23'
* commit '6deae8e0530a885b76f149841ed4899cb438ec23':
FATE: remove the -dct option from some decoding tests.
avconv: use a local variable for InputFile in open_input_file().
Conflicts:
tests/fate/microsoft.mak
tests/fate/real.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_opt.c | 15 | ||||
| -rw-r--r-- | tests/fate/microsoft.mak | 2 | ||||
| -rw-r--r-- | tests/fate/real.mak | 2 | ||||
| -rw-r--r-- | tests/fate/video.mak | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index e6a9ee7679..196ab3c477 100644 --- a/ffmpeg_opt.c +++ b/ffmpeg_opt.c @@ -698,6 +698,7 @@ static void dump_attachment(AVStream *st, const char *filename) static int open_input_file(OptionsContext *o, const char *filename) { + InputFile *f; AVFormatContext *ic; AVInputFormat *file_iformat = NULL; int err, i, ret; @@ -819,14 +820,16 @@ static int open_input_file(OptionsContext *o, const char *filename) av_dump_format(ic, nb_input_files, filename, 0); GROW_ARRAY(input_files, nb_input_files); - if (!(input_files[nb_input_files - 1] = av_mallocz(sizeof(*input_files[0])))) + f = av_mallocz(sizeof(*f)); + if (!f) exit(1); + input_files[nb_input_files - 1] = f; - input_files[nb_input_files - 1]->ctx = ic; - input_files[nb_input_files - 1]->ist_index = nb_input_streams - ic->nb_streams; - input_files[nb_input_files - 1]->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); - input_files[nb_input_files - 1]->nb_streams = ic->nb_streams; - input_files[nb_input_files - 1]->rate_emu = o->rate_emu; + f->ctx = ic; + f->ist_index = nb_input_streams - ic->nb_streams; + f->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp); + f->nb_streams = ic->nb_streams; + f->rate_emu = o->rate_emu; for (i = 0; i < o->nb_dump_attachment; i++) { int j; diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak index 10aeaf6681..6347f200ed 100644 --- a/tests/fate/microsoft.mak +++ b/tests/fate/microsoft.mak @@ -1,5 +1,5 @@ FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1 -fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an +fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an FATE_MSVIDEO1 += fate-msvideo1-8bit fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24 diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 0b9f2024e3..6c640ad0b7 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -13,7 +13,7 @@ fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm FATE_REAL-$(call DEMDEC, RM, RV30) += fate-rv30 -fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an +fate-rv30: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/real/rv30.rm -an FATE_REAL-$(call DEMDEC, RM, RV40) += fate-rv40 fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 1b835c7de4..6090074e96 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -181,7 +181,7 @@ FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc -fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30 +fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30 FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an |