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

2 files changed, 7 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;
     }
 
diff --git a/libhb/hb.c b/libhb/hb.c
index c877ae91e..a4761a867 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -257,6 +257,7 @@ void hb_ff_set_sample_fmt(AVCodecContext *context, AVCodec *codec)
         {
             if ( *fmt == AV_SAMPLE_FMT_FLT )
             {
+                context->request_sample_fmt = AV_SAMPLE_FMT_FLT;
                 context->sample_fmt = AV_SAMPLE_FMT_FLT;
                 break;
             }