aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vorbis.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-18 03:33:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-18 03:34:05 +0100
commit4cd4a6de4f976a5bf79b564daa23c97cce545caf (patch)
treed0aa23553a479abf04ba24cbd3fcf53f2d48db58 /libavcodec/vorbis.c
parentcdbebae44440bea97f300f256d722c1495753bc2 (diff)
parent2007082d2db25f9305b8a345798b840ea7784fdb (diff)
downloadffmpeg-4cd4a6de4f976a5bf79b564daa23c97cce545caf.tar.gz
Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
* commit '2007082d2db25f9305b8a345798b840ea7784fdb': mov: check ff_get_wav_header() return value Conflicts: libavformat/mov.c See: 6d55a40b00801899f7975b22401bdd96bbc228af Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbis.c')
0 files changed, 0 insertions, 0 deletions