diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:00:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 16:00:09 +0200 |
| commit | 0842e32f99105f06ad6b53f580ee777bc4bf9dee (patch) | |
| tree | b0b5b9ffcb9463556f7be33fdd5f43ba68d5fdfb /libavcodec/amrnbdec.c | |
| parent | 4c273eb64c1faa47ced1cfcf15a7a1af4d27dc44 (diff) | |
| parent | d1f05dd18375f2f8e68372edee11436927e43ba8 (diff) | |
| download | ffmpeg-0842e32f99105f06ad6b53f580ee777bc4bf9dee.tar.gz | |
Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'
* commit 'd1f05dd18375f2f8e68372edee11436927e43ba8':
ogg: calculate the start position once all the headers are parsed
Conflicts:
libavformat/oggdec.c
libavformat/oggparseskeleton.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrnbdec.c')
0 files changed, 0 insertions, 0 deletions