aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mux.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-17 13:50:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-17 13:50:31 +0200
commitb884599f6a1c05ed8a0cbab72ac898d21456a58b (patch)
tree741bc18460fd29b235d1797b6edf9ad87aebdc68 /libavformat/mux.c
parent3babbf3bf4c672624d992622cb94856c2ed95bfb (diff)
parenta11ef610eec5241e226efbd1c5bb5eb45c88d2c2 (diff)
downloadffmpeg-b884599f6a1c05ed8a0cbab72ac898d21456a58b.tar.gz
Merge commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2'
* commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2': h264: Remove some commented-out, broken cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions