1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
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
..
2011-08-09 19:56:21 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:21 +02:00
2011-08-09 19:56:24 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-04-10 04:31:54 +02:00
2011-08-09 19:56:21 +02:00
2011-08-09 19:56:21 +02:00
2011-01-30 03:41:47 +01:00