Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 14:49:04 +0000 (16:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Apr 2015 14:49:47 +0000 (16:49 +0200)
commit50e46b7f0dca4d974f4c092f663bbbcf5f3d5e99
treefcfbdc2145a0cd156bd184d278cb4e3f297e4571
parent36f862e04c2afe37c1fd541e01013c6cef4c6015
parenta09c499a2e25ded575cb9f37528384402be86ad8
Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'

* commit 'a09c499a2e25ded575cb9f37528384402be86ad8':
  rawenc: properly allocate coded_frame

Conflicts:
libavcodec/rawenc.c

See: 881f96c4c2ef0c0162f63a370cbfff3c1e1feb2a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rawenc.c