aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mxfenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-05 09:45:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-05 09:46:04 +0200
commit48af87819a035816f2fd0270d4ac3e54143a86a2 (patch)
tree3ad09422030b2ecd157eb660076857cdbbd94003 /libavformat/mxfenc.c
parent783c674da7da4335b75c23809774161e4ac4398d (diff)
parent71953ebcf94fe4ef316cdad1f276089205dd1d65 (diff)
downloadffmpeg-48af87819a035816f2fd0270d4ac3e54143a86a2.tar.gz
Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65'
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65': aac: Check init_get_bits return value Conflicts: libavcodec/aacdec.c See: 73abc3a634d84e4cc8951787323b594c5476e4a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfenc.c')
0 files changed, 0 insertions, 0 deletions