diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:36:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 23:36:33 +0100 |
| commit | ec9aef565291b1ab6c809030b2697fcbdde79a60 (patch) | |
| tree | 4982484580d8d4a75ce8181303ddbee2c3ec8d35 /tools/cws2fws.c | |
| parent | 484f8d77c6ecf995ac89d1071d3be0cae1f5326c (diff) | |
| parent | b068660ffa73f226cc03a67e214b8540fc1e11c4 (diff) | |
| download | ffmpeg-ec9aef565291b1ab6c809030b2697fcbdde79a60.tar.gz | |
Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'
* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
lavc: deprecate CODEC_CAP_NEG_LINESIZES
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/cws2fws.c')
0 files changed, 0 insertions, 0 deletions