Michael Niedermayer 9dbedf331e Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b' ...

* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
	libavcodec/bmp.c
	tests/ref/fate/yop

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

2012-12-24 15:48:02 +01:00

..

acodec

aiffenc: set correct number of bits foru8 in aiff

2012-12-20 16:05:30 +01:00

fate

Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

2012-12-24 15:48:02 +01:00

lavf

rmenc: write correct bytes per minute

2012-12-23 16:08:10 +01:00

lavf-fate

…

lavfi

fate/mp=pp: remove dering subfilter test.

2012-12-23 19:03:36 +01:00

seek

mmfdec: fix seeking

2012-12-06 11:56:00 +00:00

vsynth

mjpegenc: fix 444 block count so it is below 10

2012-12-16 15:05:31 +01:00

vsynth1

…

vsynth2

…