diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:04:13 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:04:26 +0100 |
commit | 68c90fc086fec90df374d0765985cb324986e8b4 (patch) | |
tree | 1cfa71f019d53542cbb401064d43970c9a39f154 /libavcodec/flashsvenc.c | |
parent | f602e22122473a8b717affc503583a42bccf0be9 (diff) | |
parent | 1a89025793ca73d9685a8ce8e3194efa64dd6844 (diff) | |
download | ffmpeg-68c90fc086fec90df374d0765985cb324986e8b4.tar.gz |
Merge commit '1a89025793ca73d9685a8ce8e3194efa64dd6844'
* commit '1a89025793ca73d9685a8ce8e3194efa64dd6844':
mpeg4videodec: move MpegEncContext.vol_sprite_usage to Mpeg4DecContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flashsvenc.c')
0 files changed, 0 insertions, 0 deletions