diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 01:17:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-21 01:17:41 +0200 |
| commit | b8b73739141eadcd6a685c8c5d69cfb59c5530df (patch) | |
| tree | 11d580ff7638debe20058e7589e815fd0359b3e2 /libavformat/g723_1.c | |
| parent | d46713cc7e7dfd88b813078a71ed1c29e42011ca (diff) | |
| parent | be23cee317f52f3dffa49812f412c0041d8b0de3 (diff) | |
| download | ffmpeg-b8b73739141eadcd6a685c8c5d69cfb59c5530df.tar.gz | |
Merge remote-tracking branch 'jamrial/release/1.0' into release/1.0
* jamrial/release/1.0:
oggparseskeleton: avoid header parsing failure
oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call
oggparseskeleton: Fix fisbone header parsing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g723_1.c')
0 files changed, 0 insertions, 0 deletions