Hi!
David Timms wrote:
> Index: src/buffer.cpp
> ===================================================================
> --- src/buffer.cpp (revision 116)
> +++ src/buffer.cpp (working copy)
> @@ -18,8 +18,6 @@
>
> /* $Id$ */
>
> -#define __STDC_LIMIT_MACROS // for INT64_MAX
> -
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <sys/mman.h>
That breaks the build with local ffmpeg.
> Index: src/mpgfile.cpp
> ===================================================================
> --- src/mpgfile.cpp (revision 116)
> +++ src/mpgfile.cpp (working copy)
> @@ -798,9 +798,9 @@
> int hh=mm/60; mm %= 60;
> int pp=pts%90000;
> pp=(pp*framerate)/90000;
> - buf[4] = (hh<<2) & 0x7c | (mm>>4) & 0x03;
> - buf[5] = (mm<<4) & 0xf0 | (ss>>3) & 0x07 | 0x08;
> - buf[6] = (ss<<5) & 0xe0 | (pp>>1) & 0x1f;
> + buf[4] = ((hh<<2) & 0x7c) | ((mm>>4) & 0x03);
> + buf[5] = ((mm<<4) & 0xf0) | ((ss>>3) & 0x07) | 0x08;
> + buf[6] = ((ss<<5) & 0xe0) | ((pp>>1) & 0x1f);
> buf[7] |= (pp<<7) & 0x80;
> }
Not actually necessary.
> Index: src/lavfmuxer.cpp
> ===================================================================
> --- src/lavfmuxer.cpp (revision 116)
> +++ src/lavfmuxer.cpp (working copy)
> @@ -89,7 +89,7 @@
> int16_t samples[6*1536]; // must be enough for 6 AC-3 channels --mr
> int frame_size=sizeof(samples);
> //fprintf(stderr, "** decode audio size=%d\n", sd->inbytes());
> - avcodec_decode_audio(s->codec,samples,&frame_size,
> + avcodec_decode_audio2(s->codec,samples,&frame_size,
> (uint8_t*) sd->getdata(),sd->inbytes());
> avcodec_close(s->codec);
> }
avcodec_decode_audio2 doesn't exist in the local version of ffmpeg.
What's the difference, by the way?
> Index: src/psfile.cpp
> ===================================================================
> --- src/psfile.cpp (revision 116)
> +++ src/psfile.cpp (working copy)
> @@ -188,7 +188,7 @@
> payloadbegin += 4;
> else if (sid&0x300)
> ++payloadbegin;
> - else if (sid&0xf0==0xe0) {
> + else if ((sid&0xf0)==0xe0) {
> if ( *(uint32_t*)(data+payloadbegin)==mbo32(0x00000001) )
> ++payloadbegin;
> }
Not necessary either.
> Index: src/tsfile.cpp
> ===================================================================
> --- src/tsfile.cpp (revision 116)
> +++ src/tsfile.cpp (working copy)
> @@ -24,6 +24,7 @@
> #include <list>
> #include <utility>
> #include <algorithm>
> +#include <cstring>
>
> tsfile::tsfile(inbuffer &b, int initial_offset) : mpgfile(b, initial_offset)
> {
I suppose this is for memcpy?
--
Michael "Tired" Riepe <[EMAIL PROTECTED]>
X-Tired: Each morning I get up I die a little
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
DVBCUT-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dvbcut-user
