Ticket #42149: patch-fix-ticket-42149.diff

File patch-fix-ticket-42149.diff, 7.9 KB (added by gthb (Gunnlaugur Thor Briem), 10 years ago)

patch-fix-ticket-42149.diff

  • common/video/iso-mpeg4/include/bitstrm.hpp

     
    4545#ifndef _BITSTREAM_HPP_
    4646#define _BITSTREAM_HPP_
    4747#include "inbits.h"
    48 #include <istream.h>
    49 #include <ostream.h>
     48#include <istream>
     49#include <ostream>
    5050
    5151class CIOBitStream
    5252{

  • common/video/iso-mpeg4/include/entropy.hpp

     
    3939#ifndef __ENTROPY_HPP_
    4040#define __ENTROPY_HPP_
    4141
    42 #include <istream.h>
    43 #include <ostream.h>
     42#include <istream>
     43#include <ostream>
     44
     45using namespace std;
    4446
    4547class CInBitStream;
    4648class COutBitStream;

  • common/video/iso-mpeg4/include/vopseenc.hpp

     
    7979
    8080#include "tm5rc.hpp"
    8181
     82using namespace std;
     83
    8284class CFwdBlockDCT;
    8385
    8486// HHI Schueuer:  scan selection classes to support the sadct

  • common/video/iso-mpeg4/src/app_encoder_encoder.cpp

     
    9999
    100100#include "mode.hpp"
    101101#include "tm5rc.hpp"
    102 #include "fstream.h"
     102#include "fstream"
    103103#include "sesenc.hpp"
    104104// #include "encoder/tps_sesenc.hpp" // deleted by Sharp (98/2/12)
    105105

  • common/video/iso-mpeg4/src/sys_encoder_errenc.cpp

     
    5454#include <stdio.h>
    5555#include <math.h>
    5656#include <stdlib.h>
    57 #include <iostream.h>
     57#include <iostream>
    5858
    5959#include "typeapi.h"
    6060#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_gmc_enc_util.cpp

     
    4646#include <stdio.h>
    4747#include <math.h>
    4848#include <stdlib.h>
    49 #include <iostream.h>
     49#include <iostream>
    5050#include <assert.h>
    5151
    5252#include "typeapi.h"

  • common/video/iso-mpeg4/src/sys_encoder_mbenc.cpp

     
    7575
    7676#include <stdlib.h>
    7777#include <math.h>
    78 #include <iostream.h>
     78#include <iostream>
    7979#include "typeapi.h"
    8080#include "codehead.h"
    8181#include "mode.hpp"

  • common/video/iso-mpeg4/src/sys_encoder_mbinterlace.cpp

     
    6060#include <stdio.h>
    6161#include <math.h>
    6262#include <stdlib.h>
    63 #include <iostream.h>
     63#include <iostream>
    6464
    6565#include "typeapi.h"
    6666#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_mcenc.cpp

     
    5353#include <stdio.h>
    5454#include <math.h>
    5555#include <stdlib.h>
    56 #include <iostream.h>
     56#include <iostream>
    5757
    5858#include "typeapi.h"
    5959#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_motest.cpp

     
    6767#include <stdio.h>
    6868#include <math.h>
    6969#include <stdlib.h>
    70 #include <iostream.h>
     70#include <iostream>
    7171
    7272#include "typeapi.h"
    7373#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_mvenc.cpp

     
    4444
    4545**************************************************************************/
    4646#include <stdio.h>
    47 #include <fstream.h>
     47#include <fstream>
    4848#include <math.h>
    4949#include <stdlib.h>
    5050

  • common/video/iso-mpeg4/src/sys_encoder_padenc.cpp

     
    4343#include <stdio.h>
    4444#include <math.h>
    4545#include <stdlib.h>
    46 #include <iostream.h>
     46#include <iostream>
    4747
    4848#include "typeapi.h"
    4949#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_sesenc.cpp

     
    8383#include "stdlib.h"
    8484#include "stdio.h"
    8585#include "math.h"
    86 #include "fstream.h"
    87 #include "ostream.h"
     86#include "fstream"
     87#include "ostream"
    8888
    8989#include "typeapi.h"
    9090#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_encoder_sptenc.cpp

     
    4040*************************************************************************/
    4141
    4242#include <stdio.h>
    43 #include <iostream.h>
     43#include <iostream>
    4444#include <math.h>
    4545#include <stdlib.h>
    4646

  • common/video/iso-mpeg4/src/sys_encoder_tm5rc.cpp

     
    5252
    5353#include <stdio.h>
    5454#include <stdlib.h>
    55 #include <iostream.h>
     55#include <iostream>
    5656#include <math.h>
    5757#include "header.h"
    5858#include "typeapi.h"

  • common/video/iso-mpeg4/src/sys_encoder_vopmbenc.cpp

     
    7373#include <stdio.h>
    7474#include <math.h>
    7575#include <stdlib.h>
    76 #include <iostream.h>
     76#include <iostream>
    7777
    7878#include "typeapi.h"
    7979#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_error.cpp

     
    3535#include <stdio.h>
    3636#include <math.h>
    3737#include <stdlib.h>
    38 #include <iostream.h>
     38#include <iostream>
    3939
    4040#include "typeapi.h"
    4141#include "codehead.h"

  • common/video/iso-mpeg4/src/sys_mode.cpp

     
    5050
    5151
    5252#include <string.h>
    53 #include <iostream.h>
     53#include <iostream>
    5454#include <math.h>
    5555#include "typeapi.h"
    5656#include "mode.hpp"

  • common/video/iso-mpeg4/src/sys_tps_enhcbuf.cpp

     
    3636*************************************************************************/
    3737
    3838#include <stdio.h>
    39 #include <fstream.h>
     39#include <fstream>
    4040#include <stdlib.h>
    4141
    4242#include "typeapi.h"

  • common/video/iso-mpeg4/src/tools_entropy_bitstrm.cpp

     
    4242
    4343*************************************************************************/
    4444
    45 #include <fstream.h>
    46 #include <iostream.h>
     45#include <fstream>
     46#include <iostream>
    4747#include <stdio.h>
    4848#include <stdlib.h>
    4949#include "typeapi.h"

  • common/video/iso-mpeg4/src/tools_entropy_huffman.cpp

     
    5555#include "bitstrm.hpp"
    5656
    5757#include "vlc.hpp"
    58 #include <iostream.h>
     58#include <iostream>
    5959#ifdef __MFC_
    6060#ifdef _DEBUG
    6161#undef THIS_FILE

  • common/video/iso-mpeg4/src/tools_sadct_sadct.cpp

     
    3737#include "dct.hpp"
    3838#include <math.h>
    3939#if defined(__DEBUG_SADCT_) && !defined(NDEBUG)
    40 #include <iostream.h>
     40#include <iostream>
    4141#endif
    4242#ifdef __MFC_
    4343#ifdef _DEBUG

  • common/video/iso-mpeg4/src/type_yuvac.cpp

     
    3939
    4040*************************************************************************/
    4141
    42 #include <iostream.h>
     42#include <iostream>
    4343#include "typeapi.h"
    4444
     45using namespace std;
     46
    4547#ifdef __MFC_
    4648#ifdef _DEBUG
    4749#undef THIS_FILE

  • common/video/iso-mpeg4/src/type_yuvai.cpp

     
    3737*************************************************************************/
    3838
    3939#include "typeapi.h"
    40 #include <iostream.h>
     40#include <iostream>
     41
     42using namespace std;
    4143
    4244#ifdef __MFC_
    4345#ifdef _DEBUG

  • common/video/iso-mpeg4/src/vtc_main_vtcenc.cpp

     
    5757#include <math.h>
    5858#include <assert.h>
    5959// begin: added by Sharp (99/2/16)
    60 #include <iostream.h>
     60#include <iostream>
    6161#include <sys/stat.h>
    6262// end: added by Sharp (99/2/16)
    6363

  • player/lib/audio/faad/Makefile.am

     
    3333        transfo.h\
    3434        util.h
    3535INCLUDES = -I$(top_srcdir)/include
    36 AM_CFLAGS = -O2 -Werror -Wall -fexceptions -fno-strict-aliasing
     36AM_CFLAGS = -O2 -Wall -fexceptions -fno-strict-aliasing
    3737
    3838EXTRA_DIST = COPYING libfaad60.dsp README

  • server/mp4live/video_util_resize.h

     
    9090
    9191void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,
    9292             uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,
    93              uint8_t *tY, uint8_t *tU, uint8_t *fV,
    94              uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,
     93             uint8_t *tY, uint8_t *tU, uint8_t *f_V,
     94             uint32_t tyStride, uint32_t tvStride, uint32_t tv_Stride,
    9595             uint32_t w, uint32_t h);
    9696#endif