Michael Niedermayer 2cb4d51654 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  v410dec: Implement explode mode support
  zerocodec: fix direct rendering.
  wav: init st to NULL to avoid a false-positive warning.
  wavpack: set bits_per_raw_sample for S32 samples to properly identify 24-bit
  h264: refactor NAL decode loop
  RTMPTE protocol support
  RTMPE protocol support
  rtmp: Add ff_rtmp_calc_digest_pos()
  rtmp: Rename rtmp_calc_digest to ff_rtmp_calc_digest and make it global
  swscale: add missing HAVE_INLINE_ASM check.
  lavfi: place x86 inline assembly under HAVE_INLINE_ASM.
  vc1: Add a test for interlaced field pictures
  swscale: Mark all init functions as av_cold
  swscale: x86: Drop pointless _mmx suffix from filenames
  lavf: use conditional notation for default codec in muxer declarations.
  swscale: place inline assembly bilinear scaler under HAVE_INLINE_ASM.
  dsputil: ppc: cosmetics: pretty-print
  dsputil: x86: add SHUFFLE_MASK_W macro
  configure: respect CC_O setting in check_cc

Conflicts:
	Changelog
	configure
	libavcodec/v410dec.c
	libavcodec/zerocodec.c
	libavformat/asfenc.c
	libavformat/version.h
	libswscale/utils.c
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-07-23 21:25:09 +02:00

..

libmpcodecs

vf_pp: dont pass NULL into pp, it would fail

2012-07-07 19:14:51 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-07-23 21:25:09 +02:00

af_aconvert.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_aformat.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

af_amerge.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_amix.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_anull.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

af_aresample.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_asetnsamples.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_astreamsync.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_asyncts.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_atempo.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_channelmap.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

af_channelsplit.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_earwax.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_join.c

lavfi: use avfilter_unref_bufferp() where appropriate.

2012-07-22 09:14:05 +02:00

af_pan.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_resample.c

lavfi: add error handling to filter_samples().

2012-07-09 08:25:19 +02:00

af_silencedetect.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_volume.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

all_channel_layouts.inc

lavfi: rename all_channel_layouts.h to all_channel_layouts.inc.

2012-05-18 23:34:11 +02:00

allfilters.c

lavfi: change "transmedia" into "multimedia".

2012-07-23 11:44:48 +02:00

asink_anullsink.c

lavfi: use const for AVFilterPad declarations in all filters.

2012-07-21 16:31:15 -07:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

2012-05-06 16:18:10 +02:00

asrc_aevalsrc.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

asrc_anullsrc.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

audio.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

audio.h

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

avcodec.c

lavfi: add avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

avf_concat.c

lavfi: add concat filter.

2012-07-23 11:34:20 +02:00

avf_showwaves.c

lavfi/showwaves: do not set on outlink->out_buf the sent video frame

2012-07-23 15:10:19 +02:00

avfilter.c

lavfi: rescale link->current_pts.

2012-07-17 23:46:26 +02:00

avfilter.h

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

avfiltergraph.c

avfiltergraph: add some debug info about selected pixel formats

2012-07-18 17:22:17 +02:00

avfiltergraph.h

lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy

2012-07-18 17:13:00 +02:00

bbox.c

bbox: remove superfluous initializations

2012-03-22 13:40:37 +01:00

bbox.h

lavfi: add bbox filter

2012-03-17 11:21:49 +01:00

buffer.c

lavfi: add avfilter_unref_bufferp()

2012-07-20 21:06:18 +02:00

bufferqueue.h

lavfi: add a generic API for buffer queues.

2012-05-31 17:27:27 +02:00

buffersink.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

buffersink.h

sink_buffer: implement fixed frame size.

2012-06-30 14:03:54 +02:00

buffersrc.c

buffersrc: use avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

buffersrc.h

lavfi: deprecate av_buffersrc_buffer() function

2012-06-28 22:27:05 +02:00

defaults.c

lavfi: drop deprecated and disabled packing API

2012-06-26 11:40:21 +02:00

drawutils.c

lavfi: update some deprecated functions

2012-06-16 15:15:16 +00:00

drawutils.h

drawutils: implement uniform and mask blending.

2012-04-04 16:16:09 +02:00

f_settb.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

fifo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

filtfmts.c

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

formats.c

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +02:00

formats.h

Fix misspellings of FFmpeg

2012-07-19 18:44:46 +02:00

gradfun.h

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00

graphdump.c

lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h

2012-06-25 13:42:37 +02:00

graphparser.c

Merge commit '1961e46c15c23a041f8d8614a25388a3ee9eff63'

2012-06-27 00:34:36 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

lavfutils.c

lavfutils: fix incompatible pointer type warning

2012-05-26 20:45:59 +02:00

lavfutils.h

lavfi: port libmpcodecs remove-logo filter

2012-04-07 13:57:39 +02:00

libavfilter.v

libavfilter: export ff_default_query_formats()

2012-05-25 18:54:01 +02:00

lswsutils.c

lswsutils: fix "ncompatible pointer type" warning

2012-05-26 20:46:00 +02:00

lswsutils.h

lavfi: port libmpcodecs remove-logo filter

2012-04-07 13:57:39 +02:00

Makefile

lavfi: change "transmedia" into "multimedia".

2012-07-23 11:44:48 +02:00

sink_buffer.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

split.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

src_buffer.c

lavfi: remove vsrc_buffer.h API

2012-07-03 01:32:16 +02:00

src_movie.c

src_movie: implement multiple outputs.

2012-07-23 17:14:59 +02:00

transform.c

libavfilter/transform: fix mirroring.

2012-06-20 23:55:17 +02:00

transform.h

lavfi/transform: fix make checkheaders.

2012-05-18 23:34:11 +02:00

version.h

lavfi: add alphaextract and alphamerge filters

2012-07-22 12:17:34 +02:00

vf_alphaextract.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_alphamerge.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_ass.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_bbox.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_blackdetect.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_blackframe.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_colormatrix.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_copy.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_crop.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_delogo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_deshake.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_drawtext.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_fade.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_format.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_fps.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_hflip.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_idet.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_libopencv.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_lut.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_mp.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_null.c

Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

2012-07-22 22:18:18 +02:00

vf_overlay.c

vf_overlay: fix missed return

2012-07-23 13:44:05 +02:00

vf_pad.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_removelogo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_scale.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_select.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_setfield.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_setpts.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_showinfo.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_slicify.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_super2xsai.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_swapuv.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_thumbnail.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_tile.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_tinterlace.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_transpose.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_vflip.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_yadif.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

video.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

video.h

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vsink_nullsink.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vsrc_cellauto.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

vsrc_color.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vsrc_life.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

vsrc_mandelbrot.c

lavfi: do not pass opaque field to init functions

2012-07-08 01:18:15 +02:00

vsrc_mptestsrc.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

vsrc_testsrc.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

yadif.h

Merge remote-tracking branch 'qatar/master'

2012-07-02 21:19:41 +02:00