diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 12:04:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-03 12:04:37 +0200 |
| commit | 5a63fb66936a2732b9d59edf3cebc4b6291f5d08 (patch) | |
| tree | 97184fab232f0f86119a32b79c625e1b4f1df358 /doc | |
| parent | c4f3b55f507955a5db45802b09a1a38ff7f8bb8d (diff) | |
| parent | 451606f7ce7e22aef989da3af49c48b663065d70 (diff) | |
| download | ffmpeg-5a63fb66936a2732b9d59edf3cebc4b6291f5d08.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: mark deprecated AVCodec.max_lowres for removal on next bump
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions