diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 02:56:33 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 02:56:33 +0400 |
| commit | 7d1918affee4bc70fb8ac139ba9235e7fed2979b (patch) | |
| tree | b8c1beadf98aceeee6a155ae83bfc110656ca595 /libavformat/avs.c | |
| parent | 316f6df9cc5a70c5b117793c9f167c4ce629c1e0 (diff) | |
| parent | 41f43202cf7648522b4ce0ed7bbb326655dbb9bc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvdec: remove spurious use of stream id
lavf: deprecate r_frame_rate.
lavf: round estimated average fps to a "standard" fps.
Conflicts:
ffmpeg.c
ffprobe.c
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/flvdec.c
libavformat/rawdec.c
libavformat/utils.c
tests/ref/fate/iv8-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avs.c')
| -rw-r--r-- | libavformat/avs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c index 8f3dd27dae..7bd4bcf82c 100644 --- a/libavformat/avs.c +++ b/libavformat/avs.c @@ -188,8 +188,10 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt) avs->st_video->codec->height = avs->height; avs->st_video->codec->bits_per_coded_sample=avs->bits_per_sample; avs->st_video->nb_frames = avs->nb_frames; - avs->st_video->r_frame_rate = avs->st_video->avg_frame_rate = - (AVRational){avs->fps, 1}; +#if FF_API_R_FRAME_RATE + avs->st_video->r_frame_rate = +#endif + avs->st_video->avg_frame_rate = (AVRational){avs->fps, 1}; } return avs_read_video_packet(s, pkt, type, sub_type, size, palette, palette_size); |