Michael Niedermayer 3428a9b8d5 Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68' ...

* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
  swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

2014-04-02 17:46:19 +02:00

..

acodec

avcodec: split mp2 encoder into float and fixed

2013-12-03 21:12:00 +01:00

fate

Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

2014-04-02 17:46:19 +02:00

lavf

mpeg12enc: always set closed gop flag on the first gop

2014-04-01 20:52:37 +02:00

lavf-fate

lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

2013-12-06 19:33:41 +01:00

seek

avformat/wtvenc: pad judiciously when writing mpeg2 extradata

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

vsynth

mpeg12enc: always set closed gop flag on the first gop

2014-04-01 20:52:37 +02:00

vsynth1

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

vsynth2

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00