Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jul 2012 22:56:33 +0000 (00:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jul 2012 22:56:33 +0000 (00:56 +0200)
commit7d1918affee4bc70fb8ac139ba9235e7fed2979b
treeb8c1beadf98aceeee6a155ae83bfc110656ca595
parent316f6df9cc5a70c5b117793c9f167c4ce629c1e0
parent41f43202cf7648522b4ce0ed7bbb326655dbb9bc
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>
15 files changed:
ffmpeg.c
libavformat/avformat.h
libavformat/avisynth.c
libavformat/avs.c
libavformat/electronicarts.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/nuv.c
libavformat/r3d.c
libavformat/rmdec.c
libavformat/utils.c
libavformat/vc1testenc.c
libavformat/version.h