diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:30:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:30:00 +0200 |
| commit | 88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5 (patch) | |
| tree | 82ddc6ef0f16d5f6e7eecc251e9f422f4299a980 /libavcodec/wmadata.h | |
| parent | 6190aae90dbe05d9cebfbe1a33ff6acafffeaefd (diff) | |
| parent | 803d21f38bdafe7c4e2571a9ae7052013a12923b (diff) | |
| download | ffmpeg-88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5.tar.gz | |
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadata.h')
0 files changed, 0 insertions, 0 deletions