aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-30 00:56:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-30 00:56:33 +0200
commit7d1918affee4bc70fb8ac139ba9235e7fed2979b (patch)
treeb8c1beadf98aceeee6a155ae83bfc110656ca595 /libavformat/rm.h
parent316f6df9cc5a70c5b117793c9f167c4ce629c1e0 (diff)
parent41f43202cf7648522b4ce0ed7bbb326655dbb9bc (diff)
downloadffmpeg-7d1918affee4bc70fb8ac139ba9235e7fed2979b.tar.gz
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/rm.h')
0 files changed, 0 insertions, 0 deletions