Merge commit '21aeae9c679657a1537d0d9127eff280bafc901a' into release/2.4

* commit '21aeae9c679657a1537d0d9127eff280bafc901a':
  svq1enc: check ff_get_buffer return value

Conflicts:
	libavcodec/svq1enc.c

See: 7effc26ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 02:39:51 +01:00

Diff Content Not Available