Michael Niedermayer 7ec7d626a1 Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e' ...

* commit 'aae159a7cc4df7d0521901022b778c9da251c24e':
  nuv: Do not ignore lzo decompression failures

Conflicts:
	libavcodec/nuv.c
	tests/ref/fate/nuv-rtjpeg

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

2013-08-14 10:10:14 +02:00

..

acodec

lswr: Improve default resampler's default parameters

2013-01-04 16:47:57 +01:00

fate

Merge commit 'aae159a7cc4df7d0521901022b778c9da251c24e'

2013-08-14 10:10:14 +02:00

lavf

ffmpeg: remove obsolete workaround in trim insertion.

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

lavf-fate

lavf/id3v2enc: fix cover art display on some software

2013-05-30 21:16:57 +00:00

seek

ffmpeg: remove obsolete workaround in trim insertion.

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

vsynth

swscale: treat gray as a fullrage (0-255) format

2013-07-08 15:21:48 +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