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>

diff --cc libavcodec/utils.c
index 0cf6091,b2fdd32..9aec72a
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -2161,10 -1562,10 +2161,10 @@@ size_t av_get_codec_tag_string(char *bu
  {
      int i, len, ret = 0;
  
- #define IS_PRINT(x)                                               \
+ #define TAG_PRINT(x)                                              \
      (((x) >= '0' && (x) <= '9') ||                                \
       ((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z') ||  \
 -     ((x) == '.' || (x) == ' '))
 +     ((x) == '.' || (x) == ' ' || (x) == '-' || (x) == '_'))
  
      for (i = 0; i < 4; i++) {
          len = snprintf(buf, buf_size,