Merge commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:01:44 +0000 (20:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Aug 2014 18:01:58 +0000 (20:01 +0200)
* commit 'e24d1cbc4e134e0b4448b3bc3a80f3197271b347':
  lavf: Fix leftovers from the ff_get_buffer patch

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

   * MxPEG decoder
   */
  
 +#include "internal.h"
  #include "mjpeg.h"
  #include "mjpegdec.h"
+ #include "internal.h"
  
  typedef struct MXpegDecodeContext {
      MJpegDecodeContext jpg;
@@@ -59,8 -59,8 +59,9 @@@
  #include "roqvideo.h"
  #include "bytestream.h"
  #include "elbg.h"
 +#include "internal.h"
  #include "mathops.h"
+ #include "internal.h"
  
  #define CHROMA_BIAS 1