diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:36:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:36:46 +0100 |
| commit | 66df6f5407543cf791302bf3bc6958758bdae0eb (patch) | |
| tree | 02522c460273505d552e8eaca9aaf3e98dd150d5 /doc/protocols.texi | |
| parent | c97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d (diff) | |
| parent | a1504eee41b39f62dbfe0a0ca6b96c2716bf7577 (diff) | |
| download | ffmpeg-66df6f5407543cf791302bf3bc6958758bdae0eb.tar.gz | |
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
lavc: deprecate AVCodecContext.debug_mv
Conflicts:
libavcodec/options_table.h
Not merged, debug_mv works fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
0 files changed, 0 insertions, 0 deletions