Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:04:29 +0000 (22:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 21:04:29 +0000 (22:04 +0100)
* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
  libx264: set frame packing information when relevant information is found

Conflicts:
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libx264.c

@@@ -160,7 -134,8 +161,8 @@@ static int X264_frame(AVCodecContext *c
      X264Context *x4 = ctx->priv_data;
      x264_nal_t *nal;
      int nnal, i, ret;
 -    x264_picture_t pic_out;
 +    x264_picture_t pic_out = {0};
+     AVFrameSideData *side_data;
  
      x264_picture_init( &x4->pic );
      x4->pic.img.i_csp   = x4->params.i_csp;