Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:19:01 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:21:57 +0000 (22:21 +0100)
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
libavformat/mxf.c
libavformat/mxf.h

See: 906a2638139bfcce17d423cfa3a8ee633b38a2af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxf.c

Simple merge