patches/to_upstream/06_remove_decode_on_config_no_svq3.patch - Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: patches/to_upstream/06_remove_decode_on_config_no_svq3.patch

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/

Patch Set: Created 10 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « patches/to_upstream/05_respect_flac_dirac_configure.patch ('k') | patches/to_upstream/11_mkv_buffer_overflow.patch » ('j') | no next file with comments »

OLD	NEW
1 diff -rpu -N orig/libavcodec/h264.h ffmpeg-mt/libavcodec/h264.h	1 diff -rpu -N orig/libavcodec/h264.h ffmpeg-mt/libavcodec/h264.h

2 --- orig/libavcodec/h264.h» 2010-06-17 09:39:25.209055700 -0700	2 --- orig/libavcodec/h264.h» 2010-06-24 19:19:34.642562800 -0700

3 +++ ffmpeg-mt/libavcodec/h264.h»2010-06-17 09:39:29.240458800 -0700	3 +++ ffmpeg-mt/libavcodec/h264.h»2010-06-24 19:19:37.278996600 -0700

4 @@ -602,9 +602,20 @@ typedef struct H264Context{	4 @@ -602,9 +602,20 @@ typedef struct H264Context{

5	5

6 extern const uint8_t ff_h264_chroma_qp[52];	6 extern const uint8_t ff_h264_chroma_qp[52];

7	7

8 +#if CONFIG_SVQ3_DECODER	8 +#if CONFIG_SVQ3_DECODER

9 void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);	9 void ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp);

10	10

11 void ff_svq3_add_idct_c(uint8_t dst, DCTELEM block, int stride, int qp, int d c);	11 void ff_svq3_add_idct_c(uint8_t dst, DCTELEM block, int stride, int qp, int d c);

12 +#else	12 +#else

13 +	13 +

14 +#define SVQ3_DISABLED_FUNC { av_log(NULL, AV_LOG_FATAL, "Calling svq3 when disa bled.\n"); }	14 +#define SVQ3_DISABLED_FUNC { av_log(NULL, AV_LOG_FATAL, "Calling svq3 when disa bled.\n"); }

15 +	15 +

16 +static void inline ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) SVQ3_ DISABLED_FUNC;	16 +static void inline ff_svq3_luma_dc_dequant_idct_c(DCTELEM *block, int qp) SVQ3_ DISABLED_FUNC;

17 +	17 +

18 +static void inline ff_svq3_add_idct_c(uint8_t dst, DCTELEM block, int stride, int qp, int dc) SVQ3_DISABLED_FUNC;	18 +static void inline ff_svq3_add_idct_c(uint8_t dst, DCTELEM block, int stride, int qp, int dc) SVQ3_DISABLED_FUNC;

19 +	19 +

20 +#endif	20 +#endif

21 +	21 +

22	22

23 /**	23 /**

24 * Decode SEI	24 * Decode SEI

OLD	NEW