diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 22:53:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-24 22:53:59 +0100 |
| commit | 1d9569f9e8361c3be06b9732c0b80639a51b4b87 (patch) | |
| tree | 95f5730b649726856ee2babd9c2bb30f9601f4b6 /libavdevice | |
| parent | 76c3e76eb35ce7cca5c912f0d21b736bb0be22fb (diff) | |
| parent | efe68076dab56293168ffb66d7b6c1977b740098 (diff) | |
| download | ffmpeg-1d9569f9e8361c3be06b9732c0b80639a51b4b87.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
aacenc: Fix identification padding when the bitstream is already aligned.
aacenc: Write correct length for long identification strings.
aud: remove unneeded field, audio_stream_index from context
aud: fix time stamp calculation for ADPCM IMA WS
aud: simplify header parsing
aud: set pts_wrap_bits to 64.
cosmetics: indentation
aud: support Westwood SND1 audio in AUD files.
adpcm_ima_ws: fix stereo decoding
avcodec: add a new codec_id for CRYO APC IMA ADPCM.
vqa: remove unused context fields, audio_samplerate and audio_bits
vqa: clean up audio header parsing
vqa: set time base to frame rate as coded in the header.
vqa: set packet duration.
vqa: use 1/sample_rate as the audio stream time base
vqa: set stream start_time to 0.
lavc: postpone the removal of AVCodecContext.request_channels.
lavf: postpone removing av_close_input_file().
lavc: postpone removing old audio encoding and decoding API
avplay: remove the -er option.
...
Conflicts:
Changelog
libavcodec/version.h
libavdevice/v4l.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/Makefile | 1 | ||||
| -rw-r--r-- | libavdevice/alldevices.c | 2 | ||||
| -rw-r--r-- | libavdevice/avdevice.h | 4 |
3 files changed, 0 insertions, 7 deletions
diff --git a/libavdevice/Makefile b/libavdevice/Makefile index d7806ea435..520e7b8daf 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -29,7 +29,6 @@ OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o OBJS-$(CONFIG_SNDIO_INDEV) += sndio_common.o sndio_dec.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_common.o sndio_enc.o OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o -OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index ace7c17ddf..161c3b4db0 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -51,9 +51,7 @@ void avdevice_register_all(void) REGISTER_OUTDEV (SDL, sdl); REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INDEV (V4L2, v4l2); -#if FF_API_V4L REGISTER_INDEV (V4L, v4l); -#endif REGISTER_INDEV (VFWCAP, vfwcap); REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index b001887b2f..5abf9f523f 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -56,10 +56,6 @@ LIBAVDEVICE_VERSION_MICRO) #define LIBAVDEVICE_BUILD LIBAVDEVICE_VERSION_INT -#ifndef FF_API_V4L -#define FF_API_V4L (LIBAVDEVICE_VERSION_MAJOR < 54) -#endif - /** * Return the LIBAVDEVICE_VERSION_INT constant. */ |