Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 20:53:12 +0000 (21:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 20:54:11 +0000 (21:54 +0100)
* commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084':
  mxf: Fix off by one error in d10 aes3 decoding

Conflicts:
libavformat/mxfdec.c

See: 3be02afb56f2a485fcdc747b6c2f77ed03adc6e5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxfdec.c

Simple merge