patched ffmpeg nov 2

patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch

-diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
---- orig/libavcodec/Makefile    2010-10-11 16:54:13 -0700
-+++ ffmpeg-mt/libavcodec/Makefile       2010-10-11 16:54:17 -0700
-@@ -600,6 +600,14 @@ OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)        
+diff -wurp -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
+--- orig/libavcodec/Makefile    2010-11-04 08:05:34 -0700
++++ ffmpeg-mt/libavcodec/Makefile       2010-11-04 08:05:40 -0700
+@@ -600,6 +600,14 @@ OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)
  OBJS-$(CONFIG_CHOMP_BSF)                  += chomp_bsf.o
  OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)         += dump_extradata_bsf.o
  OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF)       += h264_mp4toannexb_bsf.o
 +OBJS-$(CONFIG_MPEG4VIDEO_ES_BSF)          += mpeg4video_es_bsf.o \
 +                                             mpeg4videoenc.o ituh263enc.o \
 +                                             mpegvideo_enc.o motion_est.o \
 +                                             ratecontrol.o mpeg12data.o \
 +                                             aandcttab.o jfdctfst.o \
 +                                             jfdctint.o faandct.o \
 +                                             mpeg4video_parser.o mpegvideo.o \
 +                                             error_resilience.o h263.o mpeg4video.o mpeg4videodec.o ituh263dec.o h263dec.o
  OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF)        += imx_dump_header_bsf.o
  OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF)     += mjpega_dump_header_bsf.o
  OBJS-$(CONFIG_MOV2TEXTSUB_BSF)            += movsub_bsf.o
-diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c 2010-10-11 16:54:13 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c    2010-10-11 16:54:17 -0700
+diff -wurp -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
+--- orig/libavcodec/allcodecs.c 2010-11-04 08:05:33 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c    2010-11-04 08:05:40 -0700
 @@ -404,6 +404,7 @@ void avcodec_register_all(void)
      REGISTER_BSF     (CHOMP, chomp);
      REGISTER_BSF     (DUMP_EXTRADATA, dump_extradata);
      REGISTER_BSF     (H264_MP4TOANNEXB, h264_mp4toannexb);
 +    REGISTER_BSF     (MPEG4VIDEO_ES, mpeg4video_es);
      REGISTER_BSF     (IMX_DUMP_HEADER, imx_dump_header);
      REGISTER_BSF     (MJPEGA_DUMP_HEADER, mjpega_dump_header);
      REGISTER_BSF     (MP3_HEADER_COMPRESS, mp3_header_compress);
-diff -rpu -N orig/libavcodec/mpeg4video.h ffmpeg-mt/libavcodec/mpeg4video.h
---- orig/libavcodec/mpeg4video.h        2010-10-11 16:54:14 -0700
-+++ ffmpeg-mt/libavcodec/mpeg4video.h   2010-10-11 16:54:17 -0700
+diff -wurp -N orig/libavcodec/mpeg4video.h ffmpeg-mt/libavcodec/mpeg4video.h
+--- orig/libavcodec/mpeg4video.h        2010-11-04 08:05:34 -0700
++++ ffmpeg-mt/libavcodec/mpeg4video.h   2010-11-04 08:05:40 -0700
 @@ -91,6 +91,9 @@ void mpeg4_encode_mb(MpegEncContext *s,
  void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n,
                     int dir);
  void ff_set_mpeg4_time(MpegEncContext * s);
 +void mpeg4_encode_gop_header(MpegEncContext * s);
 +void mpeg4_encode_visual_object_header(MpegEncContext * s);
 +void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number);
  void mpeg4_encode_picture_header(MpegEncContext *s, int picture_number);
  
  int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb);
-diff -rpu -N orig/libavcodec/mpeg4video_es_bsf.c ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c
+diff -wurp -N orig/libavcodec/mpeg4video_es_bsf.c ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c
 --- orig/libavcodec/mpeg4video_es_bsf.c 1969-12-31 16:00:00 -0800
-+++ ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c    2010-10-11 16:54:17 -0700
++++ ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c    2010-11-04 08:05:40 -0700
 @@ -0,0 +1,91 @@
 +/*
 + * Copyright (c) 2009 Google Inc.
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
@@ skipping 72 matching lines @@
 +
 +    *poutbuf_size = outbuf_idx;
 +    return 0;
 +}
 +
 +AVBitStreamFilter mpeg4video_es_bsf = {
 +    "mpeg4video_es",
 +    0,
 +    mpeg4video_es_filter,
 +};
-diff -rpu -N orig/libavcodec/mpeg4videoenc.c ffmpeg-mt/libavcodec/mpeg4videoenc.c
---- orig/libavcodec/mpeg4videoenc.c     2010-10-11 16:54:14 -0700
-+++ ffmpeg-mt/libavcodec/mpeg4videoenc.c        2010-10-11 16:54:17 -0700
-@@ -872,7 +872,7 @@ void ff_set_mpeg4_time(MpegEncContext * 
+diff -wurp -N orig/libavcodec/mpeg4videoenc.c ffmpeg-mt/libavcodec/mpeg4videoenc.c
+--- orig/libavcodec/mpeg4videoenc.c     2010-11-04 08:05:34 -0700
++++ ffmpeg-mt/libavcodec/mpeg4videoenc.c        2010-11-04 08:05:40 -0700
+@@ -872,7 +872,7 @@ void ff_set_mpeg4_time(MpegEncContext *
      }
  }
  
 -static void mpeg4_encode_gop_header(MpegEncContext * s){
 +void mpeg4_encode_gop_header(MpegEncContext * s){
      int hours, minutes, seconds;
      int64_t time;
  
 @@ -902,7 +902,7 @@ static void mpeg4_encode_gop_header(Mpeg
      ff_mpeg4_stuffing(&s->pb);
  }
  
 -static void mpeg4_encode_visual_object_header(MpegEncContext * s){
 +void mpeg4_encode_visual_object_header(MpegEncContext * s){
      int profile_and_level_indication;
      int vo_ver_id;
  
 @@ -947,7 +947,7 @@ static void mpeg4_encode_visual_object_h
      ff_mpeg4_stuffing(&s->pb);
  }
  
 -static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
 +void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_number)
  {
      int vo_ver_id;