Michael Niedermayer 1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206' ...

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

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

2014-05-18 21:31:51 +02:00

..

acodec-adpcm-ima_qt

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-adpcm-ima_wav

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-adpcm-ms

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-adpcm-swf

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-adpcm-yamaha

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-alac

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-flac

fate: update seeking reference for flac

2014-04-14 17:43:25 +02:00

acodec-mp2

fate: force 128kb/sec for mp2 test

2014-04-15 16:43:38 +02:00

acodec-pcm-alaw

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-f32be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

acodec-pcm-f32le

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-f64be

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

acodec-pcm-f64le

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-mulaw

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s8

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s16be

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s16le

ff_put_wav_header: add flag to force WAVEFORMATEX

2014-04-30 16:41:35 +02:00

acodec-pcm-s24be

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s24le

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s32be

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-s32le

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

acodec-pcm-u8

ff_put_wav_header: add flag to force WAVEFORMATEX

2014-04-30 16:41:35 +02:00

lavf-aiff

fate: update seek-lavf-aiff after previous commit

2013-01-03 20:03:43 +00:00

lavf-alaw

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

lavf-asf

Merge commit '6072184e702b4b631ac72f1b66b75e5f21e0ce2d'

2014-05-01 17:40:14 +02:00

lavf-au

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-avi

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-bmp

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-dv_fmt

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-ffm

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-flv_fmt

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-gif

Cleanse GIF muxer and encoder.

2013-04-18 00:24:25 +02:00

lavf-gxf

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-jpg

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-mkv

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

lavf-mmf

10l: Update fate seeking reference after last commit.

2013-01-05 23:42:00 +01:00

lavf-mov

avformat/movenc: only ommit encoder tag of the metadata for bitexact mode

2014-03-16 16:26:35 +01:00

lavf-mpg

lavf: introduce AVFMT_TS_NEGATIVE

2013-04-25 10:13:27 +02:00

lavf-mulaw

ffmpeg: remove obsolete workaround in trim insertion.

2013-08-07 16:20:41 +02:00

lavf-mxf

mxf: Set audio packets pts

2014-03-06 19:28:20 +01:00

lavf-mxf_d10

mxf: Set audio packets pts

2014-03-06 19:28:20 +01:00

lavf-nut

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

lavf-ogg

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

2014-05-18 21:31:51 +02:00

lavf-pbmpipe

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

lavf-pcx

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-pgm

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-pgmpipe

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

lavf-ppm

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-ppmpipe

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

lavf-rm

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-sgi

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-swf

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

lavf-tga

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-tiff

fate: upate after 55d32eed8f

2013-01-08 18:47:09 +00:00

lavf-ts

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer

2013-04-26 14:51:47 +02:00

lavf-voc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

lavf-wav

ff_put_wav_header: add flag to force WAVEFORMATEX

2014-04-30 16:41:35 +02:00

lavf-wtv

avformat/wtvenc: pad judiciously when writing mpeg2 extradata

2014-03-30 06:22:54 +02:00

lavf-yuv4mpeg

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-asv1

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-asv2

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-dnxhd-720p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-720p-rd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dnxhd-1080i

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv-50

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-dv-411

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-ffv1

ffv1enc: Make ffv1.3 non experimental

2013-08-26 17:33:53 +02:00

vsynth2-flashsv

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-flv

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h261

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h263

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-h263p

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-huffyuv

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-jpegls

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-ljpeg

avcodec/mjpegenc: dont store DQT for LJPEG

2013-09-24 01:21:03 +02:00

vsynth2-mjpeg

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg1b

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-422

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-idct-int

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-ilace

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-ivlc-qprd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg2-thread-ivlc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-adap

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-adv

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-mpeg4-error

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-nr

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-qpel

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-qprd

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-rc

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-mpeg4-thread

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-msmpeg4

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-msmpeg4v2

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-rgb

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-roqvideo

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00

vsynth2-rv10

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-rv20

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-snow

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth2-snow-ll

Drop Snow codec

2013-01-06 16:30:02 +01:00

vsynth2-svq1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-wmv1

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

2012-12-03 02:33:27 +01:00

vsynth2-wmv2

Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

2013-01-21 16:07:21 +01:00

vsynth2-yuv

fate: split dependencies for fate-seek tests

2012-12-02 23:25:41 +01:00