Attachment #137219 for bug #89432





# libhb + contrib libraries
HANDBRAKE_LIBS = libhb.a
          contrib/lib/liba52.a        contrib/lib/libdca.a
          contrib/lib/libmp4v2.a      contrib/lib/libmpeg2.a
          contrib/lib/libx264.a       contrib/lib/libmkv.a ;
          contrib/lib/libmp4v2.a      contrib/lib/libfaac.a
          contrib/lib/libmp3lame.a    contrib/lib/libmpeg2.a
          contrib/lib/libvorbis.a     contrib/lib/libvorbisenc.a
          contrib/lib/libogg.a        contrib/lib/libsamplerate.a
          contrib/lib/libx264.a       contrib/lib/libxvidcore.a
          contrib/lib/libmkv.a        contrib/lib/libswscale.a ;

if $(OS) = UNKNOWN
{
    OS = CYGWIN ;
}

if $(OS) != CYGWIN
{
    HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
}

# Interfaces
CLI_BIN = HandBrakeCLI ;
CLI_SRC = test/test.c 

Lines 4-10 CC="gcc" Link Here

(-)a/configure (-1 / +1 lines)
4	CXX="g++"	4	CXX="g++"
5	CCFLAGS="$CCFLAGS -Wall -g"	5	CCFLAGS="$CCFLAGS -Wall -g"
6	OPTIM="$OPTIM -O3 -funroll-loops"	6	OPTIM="$OPTIM -O3 -funroll-loops"
7	LINKLIBS="-lz"	7	LINKLIBS="-lz -lavcodec -lavformat -lavutil -ldvdcss -ldvdread -lfaac -lmp3lame -logg -lsamplerate -lxvidcore -lswscale -lvorbis -lvorbisenc"
8		8
9	# System-specific flags	9	# System-specific flags
10	SYSTEM=`uname -s`	10	SYSTEM=`uname -s`

Lines 17-23 Link Here

(-)a/libhb/deblock.c (-1 / +1 lines)
17	*/	17	*/
18		18
19	#include "hb.h"	19	#include "hb.h"
20	#include "ffmpeg/avcodec.h"	20	#include <ffmpeg/avcodec.h>
21	#include "mpeg2dec/mpeg2.h"	21	#include "mpeg2dec/mpeg2.h"
22		22
23	#define PP7_QP_DEFAULT 0	23	#define PP7_QP_DEFAULT 0

Lines 6-12 Link Here

(-)a/libhb/decavcodec.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "ffmpeg/avcodec.h"	9	#include <ffmpeg/avcodec.h>
10		10
11	int decavcodecInit( hb_work_object_t , hb_job_t );	11	int decavcodecInit( hb_work_object_t , hb_job_t );
12	int decavcodecWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );	12	int decavcodecWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );




*/

#include "hb.h"
#include <ffmpeg/avcodec.h>
#include "mpeg2dec/mpeg2.h"

#define SUPPRESS_AV_LOG

        yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );
        
        hb_buffer_copy_settings( pv->buf_settings, buf_in );

        /* don't let 'work_loop' send a chapter mark upstream */
        buf_in->new_chap  = 0;

        pv->yadif_ready = 1;
        

    
    /* Replace buffered settings with input buffer settings */
    hb_buffer_copy_settings( pv->buf_settings, buf_in );    

    /* don't let 'work_loop' send a chapter mark upstream */
    buf_in->new_chap  = 0;

    return FILTER_OK;
}

Lines 17-23 Link Here

(-)a/libhb/denoise.c (-1 / +1 lines)
17	*/	17	*/
18		18
19	#include "hb.h"	19	#include "hb.h"
20	#include "ffmpeg/avcodec.h"	20	#include <ffmpeg/avcodec.h>
21	#include "mpeg2dec/mpeg2.h"	21	#include "mpeg2dec/mpeg2.h"
22		22
23	#define HQDN3D_SPATIAL_LUMA_DEFAULT 4.0f	23	#define HQDN3D_SPATIAL_LUMA_DEFAULT 4.0f

Lines 1-5 Link Here

(-)a/libhb/detelecine.c (-1 / +1 lines)
1	#include "hb.h"	1	#include "hb.h"
2	#include "ffmpeg/avcodec.h"	2	#include <ffmpeg/avcodec.h>
3	#include "mpeg2dec/mpeg2.h"	3	#include "mpeg2dec/mpeg2.h"
4		4
5	/*	5	/*

Lines 7-14 Link Here

(-)a/libhb/dvd.c (-2 / +2 lines)
7	#include "hb.h"	7	#include "hb.h"
8	#include "lang.h"	8	#include "lang.h"
9		9
10	#include "dvdread/ifo_read.h"	10	#include <dvdread/ifo_read.h>
11	#include "dvdread/nav_read.h"	11	#include <dvdread/nav_read.h>
12		12
13	struct hb_dvd_s	13	struct hb_dvd_s
14	{	14	{

Lines 6-12 Link Here

(-)a/libhb/encavcodec.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "ffmpeg/avcodec.h"	9	#include <ffmpeg/avcodec.h>
10		10
11	struct hb_work_private_s	11	struct hb_work_private_s
12	{	12	{

Lines 6-12 Link Here

(-)a/libhb/encfaac.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "faac.h"	9	#include <faac.h>
10		10
11	struct hb_work_private_s	11	struct hb_work_private_s
12	{	12	{

Lines 6-12 Link Here

(-)a/libhb/enclame.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "lame/lame.h"	9	#include <lame/lame.h>
10		10
11	int enclameInit( hb_work_object_t , hb_job_t );	11	int enclameInit( hb_work_object_t , hb_job_t );
12	int enclameWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );	12	int enclameWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );

Lines 6-12 Link Here

(-)a/libhb/encvorbis.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "vorbis/vorbisenc.h"	9	#include <vorbis/vorbisenc.h>
10		10
11	#define OGGVORBIS_FRAME_SIZE 1024	11	#define OGGVORBIS_FRAME_SIZE 1024
12		12

Lines 6-12 Link Here

(-)a/libhb/encxvid.c (-1 / +1 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "xvid.h"	9	#include <xvid.h>
10		10
11	int encxvidInit( hb_work_object_t , hb_job_t );	11	int encxvidInit( hb_work_object_t , hb_job_t );
12	int encxvidWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );	12	int encxvidWork( hb_work_object_t , hb_buffer_t , hb_buffer_t * );

Lines 1-7 Link Here

(-)a/libhb/hb.c (-2 / +2 lines)
1	#include "hb.h"	1	#include "hb.h"
2		2
3	#include "ffmpeg/avcodec.h"	3	#include <ffmpeg/avcodec.h>
4	#include "ffmpeg/swscale.h"	4	#include <ffmpeg/swscale.h>
5		5
6	struct hb_handle_s	6	struct hb_handle_s
7	{	7	{

Lines 6-13 Link Here

(-)a/libhb/render.c (-2 / +2 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "ffmpeg/avcodec.h"	9	#include <ffmpeg/avcodec.h>
10	#include "ffmpeg/swscale.h"	10	#include <ffmpeg/swscale.h>
11		11
12	struct hb_work_private_s	12	struct hb_work_private_s
13	{	13	{

Lines 6-13 Link Here

(-)a/libhb/sync.c (-2 / +2 lines)
6		6
7	#include "hb.h"	7	#include "hb.h"
8		8
9	#include "samplerate.h"	9	#include <samplerate.h>
10	#include "ffmpeg/avcodec.h"	10	#include <ffmpeg/avcodec.h>
11		11
12	#ifdef INT64_MIN	12	#ifdef INT64_MIN
13	#undef INT64_MIN /* Because it isn't defined correctly in Zeta */	13	#undef INT64_MIN /* Because it isn't defined correctly in Zeta */

Return to bug 89432

Lines 8-33 SubDir TOP ; Link Here

(-)a/Jamfile (-14 / +3 lines)
8		8
9	# libhb + contrib libraries	9	# libhb + contrib libraries
10	HANDBRAKE_LIBS = libhb.a	10	HANDBRAKE_LIBS = libhb.a
11	contrib/lib/liba52.a contrib/lib/libavformat.a	11	contrib/lib/liba52.a contrib/lib/libdca.a
12	contrib/lib/libavcodec.a contrib/lib/libavutil.a	12	contrib/lib/libmp4v2.a contrib/lib/libmpeg2.a
13	contrib/lib/libdca.a contrib/lib/libdvdread.a	13	contrib/lib/libx264.a contrib/lib/libmkv.a ;
14	contrib/lib/libmp4v2.a contrib/lib/libfaac.a
15	contrib/lib/libmp3lame.a contrib/lib/libmpeg2.a
16	contrib/lib/libvorbis.a contrib/lib/libvorbisenc.a
17	contrib/lib/libogg.a contrib/lib/libsamplerate.a
18	contrib/lib/libx264.a contrib/lib/libxvidcore.a
19	contrib/lib/libmkv.a contrib/lib/libswscale.a ;
20		14
21	if $(OS) = UNKNOWN	15	if $(OS) = UNKNOWN
22	{	16	{
23	OS = CYGWIN ;	17	OS = CYGWIN ;
24	}	18	}
25		19
26	if $(OS) != CYGWIN
27	{
28	HANDBRAKE_LIBS = $(HANDBRAKE_LIBS) contrib/lib/libdvdcss.a ;
29	}
30
31	# Interfaces	20	# Interfaces
32	CLI_BIN = HandBrakeCLI ;	21	CLI_BIN = HandBrakeCLI ;
33	CLI_SRC = test/test.c	22	CLI_SRC = test/test.c

Lines 17-23 Link Here

(-)a/libhb/deinterlace.c (-7 / +7 lines)
17	*/	17	*/
18		18
19	#include "hb.h"	19	#include "hb.h"
20	#include "ffmpeg/avcodec.h"	20	#include <ffmpeg/avcodec.h>
21	#include "mpeg2dec/mpeg2.h"	21	#include "mpeg2dec/mpeg2.h"
22		22
23	#define SUPPRESS_AV_LOG	23	#define SUPPRESS_AV_LOG
Lines 551-559 int hb_deinterlace_work( hb_buffer_t * buf_in, Link Here
551	yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );	551	yadif_store_ref( (const uint8_t**)pv->pic_in.data, pv );
552		552
553	hb_buffer_copy_settings( pv->buf_settings, buf_in );	553	hb_buffer_copy_settings( pv->buf_settings, buf_in );
554		554
555	/* don't let 'work_loop' send a chapter mark upstream */	555	/* don't let 'work_loop' send a chapter mark upstream */
556	buf_in->new_chap = 0;	556	buf_in->new_chap = 0;
557		557
558	pv->yadif_ready = 1;	558	pv->yadif_ready = 1;
559		559
Lines 591-599 int hb_deinterlace_work( hb_buffer_t * buf_in, Link Here
591		591
592	/* Replace buffered settings with input buffer settings */	592	/* Replace buffered settings with input buffer settings */
593	hb_buffer_copy_settings( pv->buf_settings, buf_in );	593	hb_buffer_copy_settings( pv->buf_settings, buf_in );
594		594
595	/* don't let 'work_loop' send a chapter mark upstream */	595	/* don't let 'work_loop' send a chapter mark upstream */
596	buf_in->new_chap = 0;	596	buf_in->new_chap = 0;
597		597
598	return FILTER_OK;	598	return FILTER_OK;
599	}	599	}