diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:35:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-15 23:35:53 +0200 |
commit | 1a34478b7183b1a08caab7eac56b452609725736 (patch) | |
tree | 4ddae5c3407716d83b592694cdabbdb3dff3041f /libavformat/img2.c | |
parent | 6ae356c9a0987d56f60137f9784afcb3a9303037 (diff) | |
parent | cc73511e8e81b2e1454f406acb71da9fd1c60d32 (diff) | |
download | ffmpeg-1a34478b7183b1a08caab7eac56b452609725736.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix NASM include directive
dsputil_mmx: Honor HAVE_AMD3DNOW
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
jack: add 'channels' private option.
VC-1: fix reading of custom PAR.
Remove redundant and dubious video codec detection by its extradata
mpeg12: remove repeat-field code disabled since May 2002
patch checklist: suggest fate instead of regression tests
Turn on resampling on sudden size change instead of bailing out during recode.
avtools: reinitialise filter chain when input video stream changes dimensions
Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2.c')
-rw-r--r-- | libavformat/img2.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 0531a1a8de..77145cb1cf 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -237,16 +237,6 @@ static int read_header(AVFormatContext *s1, AVFormatParameters *ap) av_log(s, AV_LOG_ERROR, "Could not parse framerate: %s.\n", s->framerate); return ret; } -#if FF_API_FORMAT_PARAMETERS - if (ap->pix_fmt != PIX_FMT_NONE) - pix_fmt = ap->pix_fmt; - if (ap->width > 0) - width = ap->width; - if (ap->height > 0) - height = ap->height; - if (ap->time_base.num) - framerate = (AVRational){ap->time_base.den, ap->time_base.num}; -#endif #if FF_API_LOOP_INPUT if (s1->loop_input) |