diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:29:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:29:11 +0100 |
| commit | 47f1af47b6cb763452c5bab3704ca965fccad25b (patch) | |
| tree | 23e8d19a05e911ab848649aed363b8f3ddbfc299 /libavcodec/h264.c | |
| parent | 1f5b5b8062706c20da0f8ca048917ae5f19107b2 (diff) | |
| parent | 70762508ec5919474edb92a5b1f266fd06640f9c (diff) | |
| download | ffmpeg-47f1af47b6cb763452c5bab3704ca965fccad25b.tar.gz | |
Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'
* commit '70762508ec5919474edb92a5b1f266fd06640f9c':
lavc: Prettify printing of codec tags containing non alphanumeric characters
h264: Rename the jpeg_420 pixfmt list to match the common naming structure
Conflicts:
libavcodec/h264.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions