Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Aug 2011 20:24:01 +0000 (22:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Aug 2011 20:24:01 +0000 (22:24 +0200)
commitdb5effe1a4209e8ace97857e5de0d66a73fe7477
tree344974a46b06148b175dfcb8d7e4c4a5ecf00646
parentea36c44e84496a35562dab6cb03d2ca9a938224f
parent22141917a987e22685ee20440148e25724451f50
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>
avconv.c
doc/avconv.texi
libavcodec/h264.c
libavformat/isom.c