diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-21 20:09:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-21 20:12:33 +0200 |
| commit | 2f9422d951dcbcad68303bed12461388a4e4b8a7 (patch) | |
| tree | e3109de2d4dab4924cc862b7cfdf7d4bac8fa0f3 /libavcodec/g722.h | |
| parent | 2444fca523d7a55caa444caad8946b853984b025 (diff) | |
| parent | ea71aafd6881d7ce5cffec56feb45488e3ac5221 (diff) | |
| download | ffmpeg-2f9422d951dcbcad68303bed12461388a4e4b8a7.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avio: Use AVERROR_PROTOCOL_NOT_FOUND
Conflicts:
libavformat/avio.c
See: 12eeced8b41bbe46693f8c9625ed61b51f8438a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.h')
0 files changed, 0 insertions, 0 deletions