Michael Niedermayer 9f088a1ed4 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  mpegvideo: reduce excessive inlining of mpeg_motion()
  mpegvideo: convert mpegvideo_common.h to a .c file
  build: factor out mpegvideo.o dependencies to CONFIG_MPEGVIDEO
  Move MASK_ABS macro to libavcodec/mathops.h
  x86: move MANGLE() and related macros to libavutil/x86/asm.h
  x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
  aacdec: Don't fall back to the old output configuration when no old configuration is present.
  rtmp: Add message tracking
  rtsp: Support mpegts in raw udp packets
  rtsp: Support receiving plain data over UDP without any RTP encapsulation
  rtpdec: Remove an unused include
  rtpenc: Remove an av_abort() that depends on user-supplied data
  vsrc_movie: discourage its use with avconv.
  avconv: allow no input files.
  avconv: prevent invalid reads in transcode_init()
  avconv: rename OutputStream.is_past_recording_time to finished.

Conflicts:
	configure
	doc/filters.texi
	ffmpeg.c
	ffmpeg.h
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/mpegvideo.c
	libavformat/version.h

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

2012-08-09 19:31:56 +02:00

..

libmpcodecs

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_amerge.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +02:00

af_amix.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

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

af_astreamsync.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +02:00

af_asyncts.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_atempo.c

lavfi/atempo: remove dead increment.

2012-08-08 22:53:00 +02:00

af_channelmap.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_channelsplit.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_earwax.c

Merge remote-tracking branch 'qatar/master'

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

af_join.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

af_pan.c

amerge/astreamsync/pan: fix license boilerplate.

2012-08-03 00:24:51 +02:00

af_resample.c

lavfi: add error handling to filter_samples().

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

af_silencedetect.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +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: add asetpts audio filter

2012-08-09 01:03:05 +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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

asrc_flite.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

audio.c

Merge remote-tracking branch 'qatar/master'

2012-08-05 22:17:02 +02:00

audio.h

Merge remote-tracking branch 'qatar/master'

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

avcodec.c

lavfi/avcodec: rename picref->samplesref variable in avfilter_get_audio_buffer_ref_from_frame()

2012-07-30 00:33:13 +02:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

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

avf_concat.c

avf_concat: fix silence duration.

2012-07-28 15:14:01 +02:00

avf_showwaves.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

avfilter.c

avfilter: Fix printf format string conversion specifier

2012-07-25 09:24:25 +02:00

avfilter.h

lavfi: document the constraints on incoming frames.

2012-08-04 21:49:05 +02:00

avfiltergraph.c

Merge remote-tracking branch 'qatar/master'

2012-07-27 23:42:19 +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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

buffersrc.h

lavfi: deprecate av_buffersrc_buffer() function

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

drawutils.c

lavfi/drawutils: make ff_draw_color() accept a const rgba map

2012-08-02 12:32:48 +02:00

drawutils.h

lavfi/drawutils: make ff_draw_color() accept a const rgba map

2012-08-02 12:32:48 +02:00

f_settb.c

lavfi/asettb: do not create a new reference in filter_samples()

2012-07-31 13:15:51 +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: add asetpts audio filter

2012-08-09 01:03:05 +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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +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 asetpts audio filter

2012-08-09 01:03:05 +02:00

vf_alphaextract.c

Merge remote-tracking branch 'qatar/master'

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

vf_alphamerge.c

vf_alphamerge: Fix reversed conditional

2012-07-27 14:00:04 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

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

vf_ass.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vf_bbox.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_blackdetect.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vf_blackframe.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_boxblur.c

Merge remote-tracking branch 'qatar/master'

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

vf_colormatrix.c

vf_colormatrix: add missing semicolon

2012-07-23 19:58:13 +00: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

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vf_deshake.c

vf_deshake: set cur_buf to NULL.

2012-07-23 22:44:25 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

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

vf_drawtext.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +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

Replace various inlined inverse AVRational with av_inv_q().

2012-08-06 00:04:36 +02:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

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

vf_gradfun.c

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vf_hflip.c

Merge remote-tracking branch 'qatar/master'

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

vf_hqdn3d.c

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vf_idet.c

Merge remote-tracking branch 'qatar/master'

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

vf_libopencv.c

cosmetics: Fix a few switched periods and linebreaks

2012-08-04 16:39:27 -04: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

lavfi/overlay: remove dead initialization.

2012-08-06 00:04:36 +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

lavfi: add asetpts audio filter

2012-08-09 01:03:05 +02:00

vf_showinfo.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +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

vf_tile: fix output buffer ownership.

2012-08-01 12:23:48 +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

yadif: update frame rate

2012-07-30 14:17:10 +02:00

video.c

lavfi: use a new field for automatic buffer copy.

2012-08-04 21:49:05 +02:00

video.h

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vsink_nullsink.c

Merge remote-tracking branch 'qatar/master'

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

vsrc_cellauto.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vsrc_life.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vsrc_mandelbrot.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vsrc_mptestsrc.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

vsrc_testsrc.c

Remove "Error parsing options string [...]" messages.

2012-08-09 08:11:00 +02:00

yadif.h

Merge remote-tracking branch 'qatar/master'

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