diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-17 07:45:33 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-15 19:59:48 +0200 |
| commit | c14fe6bc99eba55c6e52b3f3c606bb458f8a0a8e (patch) | |
| tree | cfa74cd6c190a908314abca96d9c2f2f59b1d7fb /libavformat/img2.c | |
| parent | a7c93dae55c045499ffb34a84f8d5031ae594cf9 (diff) | |
| download | ffmpeg-c14fe6bc99eba55c6e52b3f3c606bb458f8a0a8e.tar.gz | |
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.
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 a4f39e7256..935d763288 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -233,16 +233,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) |