Michael Niedermayer db5effe1a4 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Revert "h264: Properly set coded_{width, height} when parsing H.264."
  isom: add missing AVC-Intra tags, rearrange list and update comments
  avconv: remove stubs of crop* and pad* options
  avconv: re-add nb_streams to InputFile.

Conflicts:
	avconv.c

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

2011-08-29 22:24:01 +02:00

156 KiB

Raw Blame History

View Raw