diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:26:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 22:27:37 +0100 |
| commit | 0cf6b3b5b79f5f8e37645121333aa67e8266e0c6 (patch) | |
| tree | 74b916f5c88c76db861a631c58bf43daac07aac7 /libavfilter/avf_concat.c | |
| parent | 858d9947e4fe1b89d3f75a2a7d9fca7e5a496062 (diff) | |
| parent | 9e71cc81f3655cacf0f91860fba3043f13b64059 (diff) | |
| download | ffmpeg-0cf6b3b5b79f5f8e37645121333aa67e8266e0c6.tar.gz | |
Merge commit '9e71cc81f3655cacf0f91860fba3043f13b64059'
* commit '9e71cc81f3655cacf0f91860fba3043f13b64059':
movdec: handle 0x7fff langcode as macintosh per the specs
See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_concat.c')
0 files changed, 0 insertions, 0 deletions