FFmpeg/libavcodec
Michael Niedermayer f63ee2aa14 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libschroedingerenc: do not assert on values from external libraries

Conflicts:
	libavcodec/libschroedingerenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23 14:53:39 +01:00
..
2013-11-15 10:16:28 +01:00
2013-11-22 01:29:02 +01:00
2013-11-16 17:43:05 +01:00
2013-11-16 12:48:25 +01:00
2013-11-16 17:43:36 +01:00
2013-11-16 17:50:51 +01:00
2013-11-16 13:27:17 +01:00
2013-11-22 01:29:02 +01:00
2013-11-22 01:29:02 +01:00
2013-11-22 01:29:02 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:53:06 +01:00
2013-11-21 20:57:20 +01:00
2013-11-16 12:49:18 +01:00
2013-11-05 12:44:20 +00:00
2013-11-21 14:17:00 +01:00
2013-11-15 10:16:28 +01:00
2013-11-15 10:16:28 +01:00