aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-11 13:58:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-11 14:03:12 +0200
commitde31814ab07fd971d24c66a5e1ecf464b7ebe033 (patch)
tree42c68ea4d18cdfbac8051772d9853ac7d50b2f7b /libavformat/mm.c
parentc4aaff8c02cecfe42b730cb922521e4b9f26df30 (diff)
parentb522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 (diff)
downloadffmpeg-de31814ab07fd971d24c66a5e1ecf464b7ebe033.tar.gz
Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6': avio: introduce avio_closep mpegtsenc: set muxing type notification to verbose vc1dec: Use correct spelling of "opposite" a64multienc: change mc_frame_counter to unsigned arm: call arm-specific rv34dsp init functions under if (ARCH_ARM) svq1: Drop a bunch of useless parentheses parseutils-test: do not print numerical error codes svq1: K&R formatting cosmetics Conflicts: doc/APIchanges libavcodec/svq1dec.c libavcodec/svq1enc.c libavformat/version.h libavutil/parseutils.c tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mm.c')
0 files changed, 0 insertions, 0 deletions