diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 12:02:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 12:05:48 +0200 |
| commit | 76424b2da8506be50ea95e0b415f154054f0d2d1 (patch) | |
| tree | 44894f9bb6f83f191e55d00ac86873a0342edad1 /libavcodec/x86/h264_qpel.c | |
| parent | b36257921e5282c3069e1b5c6e7e758e566c7337 (diff) | |
| parent | e01fba5562133ac56a4f44c6f214a80ee33cb388 (diff) | |
| download | ffmpeg-76424b2da8506be50ea95e0b415f154054f0d2d1.tar.gz | |
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
movenc: Add an F4V muxer
Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h
See: 7bc70930ddc487712419e65ebca4d77868a20ffb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
0 files changed, 0 insertions, 0 deletions