summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:58:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-29 22:59:02 +0100
commitf602e22122473a8b717affc503583a42bccf0be9 (patch)
tree5440f0d181a273ed1eac597a0c2e671c9702072d /ffplay.c
parente2f63be01284024a39a97dff9237eb4cbbb5dbbf (diff)
parent75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea (diff)
Merge commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea'
* commit '75bd07f732fb575c2b88dc7cd08a6bb12c2e24ea': mpeg4videoenc: write 0 instead of vol_sprite_usage Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions