[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 23 14:53:39 2013 +0100| [f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0
---