diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-06 22:22:37 +0200 |
| commit | 7ae473e8a04f686bbeda75c40167c2df4211e662 (patch) | |
| tree | 073415316c09d2c86fcd41640f0bab7fddc8c4ed /libavformat/utils.c | |
| parent | a80ce390df38b30f70012c9ce059129516664805 (diff) | |
| parent | cf22705e87b6f5015b5cbbf60b6ce9b818eb1900 (diff) | |
| download | ffmpeg-7ae473e8a04f686bbeda75c40167c2df4211e662.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
nuv: K&R formatting cosmetics
build: generalise rules and variable settings for av* programs
nuv: check RTjpeg header for validity
Revert "nuv: check per-frame header for validity."
imc: remove unused field IMCContext.one_div_log2
imc: fix size of a memset()
imc: remove empty if() block
fate: simplify variable setting filter.mak
lavf: Declare an AVRational struct without a struct literal
Conflicts:
Makefile
configure
libavcodec/nuv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index a8fbbe1ac6..23b72b5b7b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2798,7 +2798,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) /* round guessed framerate to a "standard" framerate if it's * within 1% of the original estimate*/ for (j = 1; j < MAX_STD_TIMEBASES; j++) { - AVRational std_fps = (AVRational){get_std_framerate(j), 12*1001}; + AVRational std_fps = { get_std_framerate(j), 12*1001 }; double error = fabs(av_q2d(st->avg_frame_rate) / av_q2d(std_fps) - 1); if (error < best_error) { |