diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:34:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:38:54 +0200 |
| commit | 54623619373d316136d184153d0d7387acef6426 (patch) | |
| tree | a2e0cd94f3a860e24a5a2afab742d5777afe0d42 /libavcodec/aac_parser.c | |
| parent | ac20ba35e37dac843c9692a02a63e6a6e3bcce36 (diff) | |
| parent | 8435bca087c0e79385763c51de009fd89390b6a5 (diff) | |
| download | ffmpeg-54623619373d316136d184153d0d7387acef6426.tar.gz | |
Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'
* commit '8435bca087c0e79385763c51de009fd89390b6a5':
indeo4: Do not access missing reference MV
Conflicts:
libavcodec/indeo4.c
See: 5216245a, aae44fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_parser.c')
0 files changed, 0 insertions, 0 deletions