diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:31:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:34:24 +0100 |
| commit | 58770db2ae67d9b4b6adcf2b15951f9608442051 (patch) | |
| tree | a155b0f27369b59cfa7651a4a1ecd6627d3d8a58 /libavcodec/arm/h264qpel_init_arm.c | |
| parent | 5049b6a1fe52f549bad6721f162b4ec2d9d0a357 (diff) | |
| parent | 33018907bd07b34e0e70d5ae12097265eb3734d7 (diff) | |
| download | ffmpeg-58770db2ae67d9b4b6adcf2b15951f9608442051.tar.gz | |
Merge commit '33018907bd07b34e0e70d5ae12097265eb3734d7'
* commit '33018907bd07b34e0e70d5ae12097265eb3734d7':
mp3enc: allow omitting the id3v2 header with -id3v2_version 0
Conflicts:
doc/muxers.texi
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/h264qpel_init_arm.c')
0 files changed, 0 insertions, 0 deletions