diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:01:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:03:02 +0200 |
| commit | 91a0d3af651732d80b5c01777ea1c7ec541ec554 (patch) | |
| tree | 3d771962f8f4f47a673e37b8a41e678be19c6062 /libavcodec/atrac3plus.c | |
| parent | 3428a9b8d5ae8ad6d98633f7c4977adbe7c990bd (diff) | |
| parent | 9d599e3f6e61438772d8cddd6c9b7c495251f51e (diff) | |
| download | ffmpeg-91a0d3af651732d80b5c01777ea1c7ec541ec554.tar.gz | |
Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'
* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
avi: Improve non-interleaved detection
Conflicts:
libavformat/avidec.c
See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3plus.c')
0 files changed, 0 insertions, 0 deletions