diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:48:25 +0200 |
| commit | d52f874c7fa716f49bf35838d6bf0959016f48f6 (patch) | |
| tree | 57dc56cd59a4b505deb9b9cad5a452fbcb2c0519 /libavcodec/arm/flacdsp_arm.S | |
| parent | e932ae5940562ae0a183687053a5457a76fd1fa9 (diff) | |
| parent | b8604a976128ffbd316653cdec11ba487f1025bb (diff) | |
| download | ffmpeg-d52f874c7fa716f49bf35838d6bf0959016f48f6.tar.gz | |
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
oggparsecelt: do not set AVCodecContext.frame_size
Conflicts:
libavformat/oggparsecelt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/flacdsp_arm.S')
0 files changed, 0 insertions, 0 deletions