diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:50:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:50:32 +0200 |
| commit | 6a356801952b6c38042ef267808dbacbdb700eef (patch) | |
| tree | a7b7b06d6f14b7fa6be7e1c67d5d261205259957 /libavcodec/adpcm_data.h | |
| parent | cb29eb144b81cfded4d7c9a9220f45834b3d4612 (diff) | |
| parent | 03562c44c0c1e59d2a598390c5b2181ac406611c (diff) | |
| download | ffmpeg-6a356801952b6c38042ef267808dbacbdb700eef.tar.gz | |
Merge commit '03562c44c0c1e59d2a598390c5b2181ac406611c' into release/1.1
* commit '03562c44c0c1e59d2a598390c5b2181ac406611c':
avi: Improve non-interleaved detection
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.h')
0 files changed, 0 insertions, 0 deletions