diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:01:54 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:01:54 +0100 |
commit | e1cf1a9c89dbb3b867c50421cf543221a4d223f9 (patch) | |
tree | acbed33573df63b7d86f785bb44d875326f59420 /libavformat/mxf.h | |
parent | d0b450457b3aeb8c234b0b0a987db55d3485326b (diff) | |
parent | a0b7e289075dccf223b7f407790d8a86fc5d77e8 (diff) | |
download | ffmpeg-e1cf1a9c89dbb3b867c50421cf543221a4d223f9.tar.gz |
Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
aviobuf: Partial support for reading in read/write contexts
build: Avoid detecting bogus components named 'x'
Conflicts:
libavcodec/allcodecs.c
libavdevice/alldevices.c
libavformat/allformats.c
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.h')
0 files changed, 0 insertions, 0 deletions