aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacsbr.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-14 12:34:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-14 12:38:54 +0200
commit54623619373d316136d184153d0d7387acef6426 (patch)
treea2e0cd94f3a860e24a5a2afab742d5777afe0d42 /libavcodec/aacsbr.c
parentac20ba35e37dac843c9692a02a63e6a6e3bcce36 (diff)
parent8435bca087c0e79385763c51de009fd89390b6a5 (diff)
downloadffmpeg-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/aacsbr.c')
0 files changed, 0 insertions, 0 deletions