Michael Niedermayer 495eee0123 Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370' ...

* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
  Deprecate avctx.coded_frame

Conflicts:
	ffmpeg.c
	libavcodec/a64multienc.c
	libavcodec/asvenc.c
	libavcodec/cljrenc.c
	libavcodec/dpxenc.c
	libavcodec/gif.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nvenc.c
	libavcodec/proresenc_kostya.c
	libavcodec/pthread_frame.c
	libavcodec/rawenc.c
	libavcodec/sunrastenc.c
	libavcodec/tiffenc.c
	libavcodec/version.h
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

2015-07-21 01:17:15 +02:00

..

alldevices.c

Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

2014-10-27 21:26:51 +01:00

alsa_dec.c

doc: avoid incorrect phrase 'allows to'

2015-06-16 21:48:51 +02:00

alsa_enc.c

doc: avoid incorrect phrase 'allows to'

2015-06-16 21:48:51 +02:00

alsa.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

alsa.h

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

avdevice.c

avdevice: Use av_format_get_control_message_cb()

2015-01-16 02:13:01 +01:00

avdevice.h

doc: avoid incorrect phrase 'allows to'

2015-06-16 21:48:51 +02:00

avdeviceres.rc

…

avfoundation.m

avdevice/avfoundation: Fix occured typo

2015-03-30 21:41:17 +02:00

bktr.c

Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'

2015-02-16 02:56:17 +01:00

caca.c

avdeviece: Read errno before av_log() as the callback from av_log() might affect errno

2014-10-25 13:28:51 +02:00

decklink_common_c.h

avdevice/decklink: 10 Bit support for Decklink input device

2015-02-08 04:31:27 +01:00

decklink_common.cpp

avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__

2015-02-08 04:52:52 +01:00

decklink_common.h

avdevice/decklink_common: Fix "Cross-compiling FFmpeg on Debian for Windows with MinGW-w64"

2014-11-25 04:40:49 +01:00

decklink_dec_c.c

avdevice/decklink: 10 Bit support for Decklink input device

2015-02-08 04:31:27 +01:00

decklink_dec.cpp

avdevice/decklink: 10 Bit support for Decklink input device

2015-02-08 04:31:27 +01:00

decklink_dec.h

avdevice: add decklink input support

2014-09-22 02:55:24 +02:00

decklink_enc_c.c

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

decklink_enc.cpp

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

decklink_enc.h

avdevice/decklink: move general code of decklink encoder to common file

2014-09-22 01:39:50 +02:00

dshow_capture.h

avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()

2015-05-07 01:49:54 +02:00

dshow_common.c

…

dshow_crossbar.c

dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once

2015-01-26 01:29:58 -07:00

dshow_enummediatypes.c

…

dshow_enumpins.c

…

dshow_filter.c

…

dshow_pin.c

dshow: tweak logging

2015-01-26 02:04:30 -07:00

dshow.c

dshow: add capture device save and load

2015-04-22 20:12:36 +02:00

dv1394.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

dv1394.h

…

fbdev_common.c

Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'

2015-07-11 12:25:03 +02:00

fbdev_common.h

…

fbdev_dec.c

Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'

2015-04-20 03:19:47 +02:00

fbdev_enc.c

…

file_open.c

…

gdigrab.c

gdigrab: fix gdi object leak if using mouse

2014-08-19 16:07:28 +02:00

iec61883.c

Remove a few occurences of "long long" from the libraries.

2015-06-13 09:28:41 +02:00

internal.h

lavd/avdevice: introduce helper functions for sink/sources listing

2015-01-11 18:58:26 +01:00

jack.c

Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'

2015-06-08 22:48:14 +02:00

lavfi.c

avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()

2015-06-10 00:56:02 +02:00

libavdevice.v

lavd: export all symbols with av_ prefix

2014-10-20 22:01:36 +02:00

libcdio.c

lavd/libcdio: add more paranoia mode constants

2015-01-31 11:32:05 +01:00

libdc1394.c

libdc1394: Unbreak build after c201069fa

2015-04-11 10:57:18 +02:00

Makefile

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

openal-dec.c

avdevice/openal-dec: Make al_format_info const

2015-06-11 00:48:41 +02:00

opengl_enc_shaders.h

…

opengl_enc.c

msvc: Fix compilation errors due to header include order.

2014-11-27 12:40:18 +01:00

oss_dec.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

oss_enc.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

oss.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

oss.h

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

pulse_audio_common.c

avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointers

2014-11-21 18:02:01 +01:00

pulse_audio_common.h

…

pulse_audio_dec.c

Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'

2015-04-09 21:07:24 +02:00

pulse_audio_enc.c

avdevice/pulse_audio_enc: use getter function for AVFrame.channels

2014-07-28 20:06:11 +02:00

qtkit.m

lavd/qtkit: Silence deprecation warnings when using clang.

2015-03-10 12:11:15 +01:00

sdl.c

…

sndio_dec.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

sndio_enc.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

sndio.c

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

sndio.h

Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'

2015-04-09 21:36:42 +02:00

timefilter.c

…

timefilter.h

…

utils.c

lavd/avdevice: introduce helper functions for sink/sources listing

2015-01-11 18:58:26 +01:00

v4l2-common.c

v4l2: support MPEG4 compressed streams

2014-11-05 19:15:14 +01:00

v4l2-common.h

lavd/v4l2: don't use avpriv_ prefix for internal functions

2014-10-29 16:12:14 +01:00

v4l2.c

Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'

2015-07-21 01:17:15 +02:00

v4l2enc.c

lavd/v4l2: don't use avpriv_ prefix for internal functions

2014-10-29 16:12:14 +01:00

v4l.c

…

version.h

lavd: Add library identifier

2015-07-01 00:13:58 +01:00

vfwcap.c

Merge commit '4f373a5111f900af54301907132942f95276285c'

2015-04-11 02:19:32 +02:00

x11grab.c

avdevice/x11grab: use av_clip() instead of nested min & max

2015-06-06 13:18:29 +02:00

xcbgrab.c

xcbgrab: Explicitly include xcb/shape.h

2015-07-06 20:00:34 +02:00

xv.c

xv.c: Add missing const to lookup table.

2014-08-30 18:02:45 +02:00