diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 16:49:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 16:49:47 +0200 |
| commit | 50e46b7f0dca4d974f4c092f663bbbcf5f3d5e99 (patch) | |
| tree | fcfbdc2145a0cd156bd184d278cb4e3f297e4571 /libavcodec/libx264.c | |
| parent | 36f862e04c2afe37c1fd541e01013c6cef4c6015 (diff) | |
| parent | a09c499a2e25ded575cb9f37528384402be86ad8 (diff) | |
| download | ffmpeg-50e46b7f0dca4d974f4c092f663bbbcf5f3d5e99.tar.gz | |
Merge commit 'a09c499a2e25ded575cb9f37528384402be86ad8'
* commit 'a09c499a2e25ded575cb9f37528384402be86ad8':
rawenc: properly allocate coded_frame
Conflicts:
libavcodec/rawenc.c
See: 881f96c4c2ef0c0162f63a370cbfff3c1e1feb2a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libx264.c')
0 files changed, 0 insertions, 0 deletions