Michael Niedermayer 47f1af47b6 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>

2013-03-07 11:29:11 +01:00

92 KiB

Raw Blame History

View Raw