Merge remote-tracking branch 'qatar/master'

* qatar/master:
  print_options: do not generate docs for options without enc or dec flags
  mpeg12: do not fail on zero dimensions in the sequence header.

Conflicts:
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/print_options.c
Simple merge

diff --cc libavcodec/mpeg12.c
index 4a83cfd,bd018d3..3f5548d
--- 1/libavcodec/mpeg12.c
--- 2/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@@ -2334,16 -2275,9 +2340,17 @@@ static int decode_chunks(AVCodecContex
              break;
  
          case PICTURE_START_CODE:
 +            if (picture_start_code_seen && s2->picture_structure == PICT_FRAME) {
 +               /* If it's a frame picture, there can't be more than one picture header.
 +                  Yet, it does happen and we need to handle it. */
 +               av_log(avctx, AV_LOG_WARNING, "ignoring extra picture following a frame-picture\n");
 +               break;
 +            }
 +            picture_start_code_seen = 1;
 +
              if (s2->width <= 0 || s2->height <= 0) {
-                 av_log(avctx, AV_LOG_ERROR, "%dx%d is invalid\n", s2->width, s2->height);
+                 av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions %dx%d.\n",
+                        s2->width, s2->height);
                  return AVERROR_INVALIDDATA;
              }