aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv30.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:44:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:45:05 +0100
commite2f63be01284024a39a97dff9237eb4cbbb5dbbf (patch)
tree292375339003cfe9adba551ae53e00ffa69207df /libavcodec/rv30.c
parentad13b8ca9bf5a5cad9cbd4bb36dcd3134d2a2019 (diff)
parente62a43f6b1a9c0c82e1df33c0c038e32029c0aa4 (diff)
downloadffmpeg-e2f63be01284024a39a97dff9237eb4cbbb5dbbf.tar.gz
Merge commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4'
* commit 'e62a43f6b1a9c0c82e1df33c0c038e32029c0aa4': mpeg4videodec: move MpegEncContext.time_increment_bits to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv30.c')
0 files changed, 0 insertions, 0 deletions