From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 9 Dec 2013 21:16:27 +0000 (+0100)
Subject: Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'
X-Git-Tag: android-x86-6.0-r1~8429
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=33dfddf65324dcb28114ea6907071605c2c3857b;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '3d1d175367f1f22e0c4952299a258272e2e2acf1'

* commit '3d1d175367f1f22e0c4952299a258272e2e2acf1':
  mpeg12enc: set frame packing information when relevant metadata is found

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

33dfddf65324dcb28114ea6907071605c2c3857b
diff --cc libavcodec/mpeg12enc.c
index a550379534,6c4ef6d7e4..22f9fcba00
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c
@@@ -28,10 -28,10 +28,12 @@@
  #include <stdint.h>
  
  #include "libavutil/attributes.h"
 +#include "libavutil/avassert.h"
  #include "libavutil/log.h"
  #include "libavutil/opt.h"
 +#include "libavutil/timecode.h"
+ #include "libavutil/stereo3d.h"
+ 
  #include "avcodec.h"
  #include "bytestream.h"
  #include "mathops.h"