OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f5b5b8 7076250)
Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Mar 2013 10:29:11 +0000 (11:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Mar 2013 10:29:11 +0000 (11:29 +0100)
commit47f1af47b6cb763452c5bab3704ca965fccad25b
tree23e8d19a05e911ab848649aed363b8f3ddbfc299tree | snapshot
parent1f5b5b8062706c20da0f8ca048917ae5f19107b2commit | diff
parent70762508ec5919474edb92a5b1f266fd06640f9ccommit | diff
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>
libavcodec/utils.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help