[FFmpeg-cvslog] Merge commit '70762508ec5919474edb92a5b1f266fd06640f9c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar  7 11:29:11 2013 +0100| [47f1af47b6cb763452c5bab3704ca965fccad25b] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47f1af47b6cb763452c5bab3704ca965fccad25b
---