OSDN Git Service

Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:12:36 +0000 (22:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Nov 2013 21:18:40 +0000 (22:18 +0100)
commitf924d6e40b269158ff54f5b5a6f08ae3fdefbd5c
treec46be6357fb1aff830adac583e1545ead6204cfa
parenta677fb664ab876e2b87a353752d00b9217ddcf01
parent95fd52c11bff1aad93a29aed3bd5472bd2981d1f
Merge commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f'

* commit '95fd52c11bff1aad93a29aed3bd5472bd2981d1f':
  mxfdec: set extradata size

Conflicts:
libavformat/mxfdec.c

no change as ffmpeg was not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>