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 /libavdevice | |
| 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 'libavdevice')
| -rw-r--r-- | libavdevice/alldevices.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index d1a5fd81c4..daa66382b1 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -35,7 +35,6 @@ av_register_input_format(&ff_##x##_demuxer); \ } -/* Warning: do not split this line, it will break configure script */ #define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x) void avdevice_register_all(void) |