Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)
* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
configure
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/intrax8.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mss2.c
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/vc1dec.c

diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -21,8 -21,8 +21,9 @@@
   * @brief IntraX8 (J-Frame) subdecoder, used by WMV2 and VC-1
   */
  
 +#include "libavutil/avassert.h"
  #include "avcodec.h"
+ #include "error_resilience.h"
  #include "get_bits.h"
  #include "mpegvideo.h"
  #include "msmpeg4data.h"
   * MPEG-1/2 decoder
   */
  
 +#define UNCHECKED_BITSTREAM_READER 1
 +
  //#define DEBUG
++#include "libavutil/avassert.h"
++#include "libavutil/timecode.h"
++
  #include "internal.h"
  #include "avcodec.h"
  #include "dsputil.h"
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
 +#define UNCHECKED_BITSTREAM_READER 1
 +
 +#include "libavutil/opt.h"
+ #include "error_resilience.h"
  #include "mpegvideo.h"
  #include "mpeg4video.h"
  #include "h263.h"
Simple merge
Simple merge
Simple merge
Simple merge