Wim Taymans 49f4bc87d9 Merge branch 'master' into 0.11 ...

Conflicts:
	ext/x264/gstx264enc.c

2012-02-10 17:00:33 +01:00

..

gstmad.c

Merge branch 'master' into 0.11

2012-02-10 17:00:33 +01:00

gstmad.h

mad: remove left-over id3tag.h include

2012-01-07 21:04:01 +00:00

Makefile.am

mad: fix LIBS order in Makefile.am

2012-01-08 14:24:11 +00:00