diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:40:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:40:50 +0200 |
| commit | aa24729c213538f2f378696d40c5f5b38dc78d7e (patch) | |
| tree | e66b92f4a95257f66e025c4d95d9d885ba1c93c2 /libavformat/aqtitledec.c | |
| parent | 66328da700c73246e2d4c5254905f9e5b4e0fa31 (diff) | |
| parent | 1c6d2bb9a9279d8df4e8bcdc1e1e2741723dc7c9 (diff) | |
| download | ffmpeg-aa24729c213538f2f378696d40c5f5b38dc78d7e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors
Conflicts:
libavcodec/pcm-mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aqtitledec.c')
0 files changed, 0 insertions, 0 deletions