1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavdevice
Michael Niedermayer 8772156be0 Merge remote branch 'qatar/master'
* qatar/master:
  APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
  Introduce slice threads flag.
  FATE: allow forcing thread-type when doing threaded fate runs.
  Use av_log_ask_for_sample() where appropriate.
  error: sort, pack, and align error code and string definitions
  The stabilization period after version bumps should be one month, not one week.
  applehttp: Expose the stream bitrate via metadata
  doc: Add some initial docs on the applehttp demuxer
  Provide a fallback version of the libm function trunc
  libavdevice: Define _XOPEN_SOURCE for usleep
  lavc: provide deprecated avcodec_thread_init until next major version
  lavc: provide the opt.h header until the next bump
  error: change AVERROR_EOF value
  error: remove AVERROR_NUMEXPECTED
  error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c

Conflicts:
	libavcodec/h264.c
	libavutil/error.c
	libavutil/error.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-22 03:54:30 +02:00
..
alldevices.c framebuffer device demuxer 2011-03-28 16:49:22 +02:00
alsa-audio-common.c Allow to print wider unsupported channel layouts. 2011-04-15 11:50:28 +02:00
alsa-audio-dec.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
alsa-audio-enc.c ALSA: implement channel layout for playback. 2011-03-26 16:50:09 +01:00
alsa-audio.h ALSA: implement channel layout for playback. 2011-03-26 16:50:09 +01:00
avdevice.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
avdevice.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
bktr.c Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
dv1394.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
dv1394.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
fbdev.c Revert "fbdev: simplify logic in fbdev_read_packet()" 2011-04-11 00:37:52 +02:00
jack_audio.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavdevice.v
libdc1394.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
Makefile framebuffer device demuxer 2011-03-28 16:49:22 +02:00
oss_audio.c Simplify: Use FFMIN. 2011-03-29 20:18:45 +02:00
sndio_common.c sndio bug fix 2011-03-29 21:19:39 -07:00
sndio_common.h sndio: prefer "FFmpeg" over "Libav" in the license header 2011-03-28 22:50:09 +02:00
sndio_dec.c sndio: prefer "FFmpeg" over "Libav" in the license header 2011-03-28 22:50:09 +02:00
sndio_enc.c Simplify: Use FFMIN. 2011-03-29 20:18:45 +02:00
v4l2.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
v4l.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vfwcap.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
x11grab.c Cosmetics: Rename variable param as the more appropriate dpyname. 2011-04-12 09:33:19 +02:00