diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:19:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:21:57 +0100 |
| commit | 2265212396c1126ee4b21cc038a2bc7eab16e60a (patch) | |
| tree | 32bc09278c624be2d2f99fd452ba5e00ba2518c5 /doc/examples/resampling_audio.c | |
| parent | 1618f162a9daa1048c08eefe8086f78ea45e3647 (diff) | |
| parent | e118bb1a33889d4df56f28975b4fd0793b4f5c32 (diff) | |
| download | ffmpeg-2265212396c1126ee4b21cc038a2bc7eab16e60a.tar.gz | |
Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
* 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>
Diffstat (limited to 'doc/examples/resampling_audio.c')
0 files changed, 0 insertions, 0 deletions