]> git.sesse.net Git - ffmpeg/commit
Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:26:27 +0000 (21:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 19:26:59 +0000 (21:26 +0200)
commit58eaa95116d914c8de303893ddf9fa9b11803b3f
tree758f6ccd54c101493f24a738457ea3ffec54344e
parent92de4450347cbee96e64de341ac6fa733ea13cd1
parentccbf370f2000b9b27f4af259c23007d67f7ea46e
Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e'

* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.h