Michael Niedermayer 330e440706 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>

2013-03-18 17:43:43 +01:00

3.7 KiB

Raw Blame History

View Raw