OSDN Git Service

Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:58:09 +0000 (22:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:59:02 +0000 (22:59 +0100)
commitf602e22122473a8b717affc503583a42bccf0be9
tree5440f0d181a273ed1eac597a0c2e671c9702072d
parente2f63be01284024a39a97dff9237eb4cbbb5dbbf
parent75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea
Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'

* commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea':
  mpeg4videoenc: write 0 instead of vol_sprite_usage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg4videoenc.c