diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:25:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:25:07 +0100 |
| commit | 2980c8e7d34e84f98b09965d208a583a16d5aded (patch) | |
| tree | 7ce6ba4bf3489d1577f5ae82656641147a843fab /libswscale | |
| parent | 79216a189b4e55dd3dbeb49612111061f2c2b717 (diff) | |
| parent | cb70a93ca1e7fae1b5dfb65ad149d311a65206a4 (diff) | |
| download | ffmpeg-2980c8e7d34e84f98b09965d208a583a16d5aded.tar.gz | |
Merge commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'
* commit 'cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
lavc: Document interaction between avcodec_open2() and decoding routines
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
0 files changed, 0 insertions, 0 deletions