summaryrefslogtreecommitdiffstats
path: root/libhb/decavcodec.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-06-07 20:35:42 +0000
committerjstebbins <[email protected]>2011-06-07 20:35:42 +0000
commite07dec1ec259a52a893642da14856e16085f3c36 (patch)
treebe1327d7b2e3c16864c10ec70cccbc3e6185cd53 /libhb/decavcodec.c
parent67ea7b336383310f92188257a71665fc50cb115c (diff)
Bump FFmpeg from git-0b32da9 to git-v0.7b2-406-g7b20d35 (from Libav)
Highlights: - Sources with more than 20 streams (video, audio and subtitles combined) are now supported - Adds decoding support for 10-bit H.264 - Adds frame-based threading for H.264 and VP8 Not yet enabled in HB. See experimental patch on RB to enable. - Quality tweaks for the AC3 encoder - AAC encoder improvements Not yet enabled in HB. See experimental patch on RB to enable. - Miscellaneous other fixes and improvements git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4028 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/decavcodec.c')
-rw-r--r--libhb/decavcodec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index 3279feef4..f41ad239d 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -1077,7 +1077,12 @@ static int setup_extradata( hb_work_object_t *w, hb_buffer_t *in )
// we haven't been inflicted with M$ - allocate a little space as
// a marker and return success.
pv->context->extradata_size = 0;
- pv->context->extradata = av_malloc(pv->context->extradata_size);
+ // av_malloc uses posix_memalign which is allowed to
+ // return NULL when allocating 0 bytes. We use extradata == NULL
+ // to trigger initialization of extradata and the decoder, so
+ // we can not set it to NULL here. So allocate a small
+ // buffer instead.
+ pv->context->extradata = av_malloc(1);
return 0;
}