diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-29 22:24:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-29 22:24:01 +0200 |
| commit | db5effe1a4209e8ace97857e5de0d66a73fe7477 (patch) | |
| tree | 344974a46b06148b175dfcb8d7e4c4a5ecf00646 /libavformat/lmlm4.c | |
| parent | ea36c44e84496a35562dab6cb03d2ca9a938224f (diff) | |
| parent | 22141917a987e22685ee20440148e25724451f50 (diff) | |
| download | ffmpeg-db5effe1a4209e8ace97857e5de0d66a73fe7477.tar.gz | |
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>
Diffstat (limited to 'libavformat/lmlm4.c')
0 files changed, 0 insertions, 0 deletions