diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 20:49:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 21:08:53 +0100 |
| commit | f93bd82ee6bca14abf05f42024f02f03efebe054 (patch) | |
| tree | 0f447e65ae882984651c63e0033e605b1e470a82 /libavcodec/mpeg4audio.c | |
| parent | b295bce148133966091cc1086a0318298fb8e8b8 (diff) | |
| parent | a9099e04026f300924ac363fa6f8aef912677d90 (diff) | |
| download | ffmpeg-f93bd82ee6bca14abf05f42024f02f03efebe054.tar.gz | |
Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90'
* commit 'a9099e04026f300924ac363fa6f8aef912677d90':
mxf: Add uncompressed 422 8-bit rawvideo UL
Conflicts:
libavformat/mxf.c
See: 51d632cc8f4c8fa1556d7d8c18c5488700eb6154
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.c')
0 files changed, 0 insertions, 0 deletions