diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
| commit | e8e4c8bddee7b77747346ca5047a84cc40dafc11 (patch) | |
| tree | 8062747ec4d71f28da7fc9377af81cea3394022b /libavformat/subtitles.h | |
| parent | f4c020e3ad0a2a1412cc94b3d7df7063b37ae429 (diff) | |
| parent | 8db73c61a7b24bc4f4d3d415bea2990d17d16354 (diff) | |
| download | ffmpeg-e8e4c8bddee7b77747346ca5047a84cc40dafc11.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: allow non-standard variations of linker -l/-L flags
Add reminders to update the codec descriptor list with new codec IDs.
Conflicts:
Makefile
configure
libavcodec/avcodec.h
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.h')
0 files changed, 0 insertions, 0 deletions