Michael Niedermayer 4778783160 Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' ...

* commit '3b266da3d35f3f7a61258b78384dfe920d875d29':
  avconv: add support for complex filtergraphs.
  avconv: make filtergraphs global.
  avconv: move filtered_frame from InputStream to OutputStream.
  avconv: don't set output width/height directly from input value.
  avconv: move resample_{width,height,pix_fmt} to InputStream.
  avconv: remove a useless variable from OutputStream.
  avconv: get output pixel format from lavfi.
  graphparser: fix the order in which unlabeled input links are returned.
  avconv: change {input,output}_{streams,files} into arrays of pointers.
  avconv: don't pass input/output streams to some functions.

Conflicts:
	cmdutils.c
	cmdutils.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffplay.c

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

2012-04-17 04:03:50 +02:00

..

ac3_ac3

fate: make acodec-ac3_fixed test output raw AC3

2012-02-02 14:31:54 +00:00

adpcm_ima_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

adpcm_ms_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

adpcm_qt_aiff

aiffdec: do not set AVCodecContext.frame_size

2012-03-05 13:08:17 -05:00

adpcm_swf_flv

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

adpcm_yam_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

alac_m4a

FATE: update reference for seek-alac_mp4

2012-02-11 16:41:01 -05:00

asv1_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

asv2_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

dnxhd_720p_dnxhd

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

dnxhd_720p_rd_dnxhd

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

dnxhd_1080i_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

dv50_dv

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

dv411_dv

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

dv_dv

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

error_mpeg4_adv_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

ffv1_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

flac_flac

Replace vendor string in Ogg and FLAC muxers.

2011-11-02 10:43:39 +01:00

flashsv_flv

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

flv_flv

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

g726_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

h261_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

h263_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

h263p_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

huffyuv_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_bmp

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_jpg

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_pcx

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_pgm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_ppm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_sgi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_tga

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

image_tiff

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

jpegls_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_aif

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_al

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_asf

asfenc: properly write index information

2012-04-05 06:03:10 +02:00

lavf_au

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_avi

avconv: rework -t handling for encoding.

2012-02-07 20:11:11 +01:00

lavf_dv

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

lavf_ffm

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_flv

Update seek reference for added metadata to lavf tests.

2011-12-12 21:54:52 +01:00

lavf_gif

ffmpeg: deprecate loop_input and loop_output options

2011-07-08 19:58:19 +02:00

lavf_gxf

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_mkv

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_mmf

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_mpg

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_mxf

mxfdec: hybrid demuxing/seeking solution

2012-01-22 14:40:53 +01:00

lavf_mxf_d10

mxfdec: hybrid demuxing/seeking solution

2012-01-22 14:40:53 +01:00

lavf_nut

Update seek reference for added metadata to lavf tests.

2011-12-12 21:54:52 +01:00

lavf_ogg

Update seek reference for added metadata to lavf tests.

2011-12-12 21:54:52 +01:00

lavf_rm

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_swf

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_ts

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_ul

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

lavf_voc

voc/avs: Do not change the sample rate mid-stream.

2012-03-03 17:03:27 -05:00

lavf_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

lavf_wtv

Merge remote-tracking branch 'qatar/master'

2012-03-22 00:40:11 +01:00

lavf_y4m

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

ljpeg_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mjpeg_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mp2_mp2

mpegaudio_parser: do not ignore information from the first parsed frame

2012-03-03 17:03:26 -05:00

mpeg1_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg1b_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2_422_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2_idct_int_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2i_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2ivlc_qprd_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2thread_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg2threadivlc_mpg

rawdec: set timebase to 1/fps.

2012-02-26 07:30:21 +01:00

mpeg4_adap_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_adv_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_nr_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_Q_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_qprd_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_rc_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

mpeg4_thread_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

msmpeg4_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

msmpeg4v2_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

odivx_mp4

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pbmpipe_pbm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_alaw_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

pcm_f32be_au

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_f32le_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_f64be_au

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_f64le_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_mulaw_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

pcm_s8_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s16be_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s16le_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

pcm_s24be_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s24daud_302

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s24le_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s32be_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_s32le_wav

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

pcm_u8_wav

riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header

2011-10-14 13:28:58 +02:00

pgmpipe_pgm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

ppmpipe_ppm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

rgb_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

roqav_roq

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

rv10_rm

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

rv20_rm

Update rv20 seek test reference

2010-09-26 09:02:51 +00:00

snow53_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

snow_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

svq1_mov

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

wmv1_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

wmv2_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00

yuv_avi

regtest: rename seektest ref files using alphanumeric chars only

2010-07-20 10:09:54 +00:00