diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:17:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 16:17:42 +0100 |
| commit | be023405a7cdbdd6b5d163de8beb1968ee4ef52e (patch) | |
| tree | 19de2dcd0a29d535729e8dfde16d06ddfc275866 /libavcodec/h261.h | |
| parent | 392080cbe52868c00f8dfd4e60639c37a13165f4 (diff) | |
| parent | f771b3ab5d3c0b763ee356152be550f4121babd0 (diff) | |
| download | ffmpeg-be023405a7cdbdd6b5d163de8beb1968ee4ef52e.tar.gz | |
Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0'
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
avidec: do not export stream_codec_tag
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261.h')
0 files changed, 0 insertions, 0 deletions