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

..

fate

fate: add and fix subtitles dependencies.

2012-12-20 03:50:34 +01:00

ref

Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

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

audiogen.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

base64.c

…

copycooker.sh

…

fate-run.sh

Merge remote-tracking branch 'qatar/master'

2012-12-05 17:33:12 +01:00

fate-update.sh

…

fate-valgrind.supp

…

fate.sh

Merge remote-tracking branch 'qatar/master'

2012-09-06 16:23:17 +02:00

ffserver-regression.sh

…

ffserver.conf

…

ffserver.regression.ref

…

lavf-regression.sh

IRCAM demuxer & muxer

2012-12-05 13:01:22 +00:00

lavfi-regression.sh

lavfi: add pp filter.

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

lena.pnm

…

Makefile

fate: check if rsync has the contimeout option

2012-12-15 01:33:19 +01:00

md5.sh

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

regression-funcs.sh

…

rotozoom.c

…

test.ffmeta

fate/ffprobe: add some stream metadata.

2012-10-08 11:03:27 +02:00

tiny_psnr.c

Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'

2012-10-16 14:04:14 +02:00

utils.c

…

videogen.c

…