diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:57:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:57:28 +0200 |
commit | dd98d9d1ff88b5dcd413e8d5359aaaf478de32e5 (patch) | |
tree | c65fb88e1c4a0488f95577500cba268959251023 /libavcodec/vaapi_h264.c | |
parent | d6c36fba0be8aaa7ba3f15f8a2a7b872817200f3 (diff) | |
parent | 7684a36113fa12c88ba80b5498f05849a6b58632 (diff) | |
download | ffmpeg-dd98d9d1ff88b5dcd413e8d5359aaaf478de32e5.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfenc: switch to av_reallocp_array() and check allocation errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
0 files changed, 0 insertions, 0 deletions