Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Side by Side Diff: patches/to_upstream/04_vc1_bsfs.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, 5 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
OLDNEW
1 diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile 1 diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
2 --- orig/libavcodec/Makefile» 2010-06-17 09:45:05.049036300 -0700 2 --- orig/libavcodec/Makefile» 2010-06-24 19:19:20.508781600 -0700
3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-06-17 09:45:06.985229900 -0700 3 +++ ffmpeg-mt/libavcodec/Makefile» 2010-06-24 19:19:23.987626200 -0700
4 @@ -603,6 +603,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) 4 @@ -603,6 +603,9 @@ OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF)
5 OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o 5 OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o
6 OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o 6 OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
7 OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o 7 OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
8 +OBJS-$(CONFIG_VC1_ASFTORCV_BSF) += vc1_asftorcv_bsf.o 8 +OBJS-$(CONFIG_VC1_ASFTORCV_BSF) += vc1_asftorcv_bsf.o
9 +OBJS-$(CONFIG_VC1_ASFTOANNEXG_BSF) += vc1_asftoannexg_bsf.o vc1.o \ 9 +OBJS-$(CONFIG_VC1_ASFTOANNEXG_BSF) += vc1_asftoannexg_bsf.o vc1.o \
10 + vc1data.o msmpeg4data.o 10 + vc1data.o msmpeg4data.o
11 11
12 # thread libraries 12 # thread libraries
13 OBJS-$(HAVE_BEOSTHREADS) += beosthread.o 13 OBJS-$(HAVE_BEOSTHREADS) += beosthread.o
14 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c 14 diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
15 --- orig/libavcodec/allcodecs.c»2010-06-17 09:45:03.192850700 -0700 15 --- orig/libavcodec/allcodecs.c»2010-06-24 19:19:20.071976000 -0700
16 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-06-17 09:45:06.990230400 -0700 16 +++ ffmpeg-mt/libavcodec/allcodecs.c» 2010-06-24 19:19:23.987626200 -0700
17 @@ -390,5 +390,7 @@ void avcodec_register_all(void) 17 @@ -403,5 +403,7 @@ void avcodec_register_all(void)
18 REGISTER_BSF (NOISE, noise); 18 REGISTER_BSF (NOISE, noise);
19 REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata); 19 REGISTER_BSF (REMOVE_EXTRADATA, remove_extradata);
20 REGISTER_BSF (TEXT2MOVSUB, text2movsub); 20 REGISTER_BSF (TEXT2MOVSUB, text2movsub);
21 + REGISTER_BSF (VC1_ASFTORCV, vc1_asftorcv); 21 + REGISTER_BSF (VC1_ASFTORCV, vc1_asftorcv);
22 + REGISTER_BSF (VC1_ASFTOANNEXG, vc1_asftoannexg); 22 + REGISTER_BSF (VC1_ASFTOANNEXG, vc1_asftoannexg);
23 } 23 }
24 24
25 diff -rpu -N orig/libavcodec/vc1_asftoannexg_bsf.c ffmpeg-mt/libavcodec/vc1_asft oannexg_bsf.c 25 diff -rpu -N orig/libavcodec/vc1_asftoannexg_bsf.c ffmpeg-mt/libavcodec/vc1_asft oannexg_bsf.c
26 --- orig/libavcodec/vc1_asftoannexg_bsf.c 1969-12-31 16:00:00.000000000 -0 800 26 --- orig/libavcodec/vc1_asftoannexg_bsf.c 1969-12-31 16:00:00.000000000 -0 800
27 +++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c» 2010-06-17 09:45:07.001231500 -0 700 27 +++ ffmpeg-mt/libavcodec/vc1_asftoannexg_bsf.c» 2010-06-24 19:19:24.003226400 -0 700
28 @@ -0,0 +1,182 @@ 28 @@ -0,0 +1,182 @@
29 +/* 29 +/*
30 + * copyright (c) 2010 Google Inc. 30 + * copyright (c) 2010 Google Inc.
31 + * 31 + *
32 + * This file is part of FFmpeg. 32 + * This file is part of FFmpeg.
33 + * 33 + *
34 + * FFmpeg is free software; you can redistribute it and/or 34 + * FFmpeg is free software; you can redistribute it and/or
35 + * modify it under the terms of the GNU Lesser General Public 35 + * modify it under the terms of the GNU Lesser General Public
36 + * License as published by the Free Software Foundation; either 36 + * License as published by the Free Software Foundation; either
37 + * version 2.1 of the License, or (at your option) any later version. 37 + * version 2.1 of the License, or (at your option) any later version.
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 +} 203 +}
204 + 204 +
205 +AVBitStreamFilter vc1_asftoannexg_bsf = { 205 +AVBitStreamFilter vc1_asftoannexg_bsf = {
206 + "vc1_asftoannexg", 206 + "vc1_asftoannexg",
207 + sizeof(ASFTOANNEXGBSFContext), 207 + sizeof(ASFTOANNEXGBSFContext),
208 + asftoannexg_filter, 208 + asftoannexg_filter,
209 + asftoannexg_close, 209 + asftoannexg_close,
210 +}; 210 +};
211 diff -rpu -N orig/libavcodec/vc1_asftorcv_bsf.c ffmpeg-mt/libavcodec/vc1_asftorc v_bsf.c 211 diff -rpu -N orig/libavcodec/vc1_asftorcv_bsf.c ffmpeg-mt/libavcodec/vc1_asftorc v_bsf.c
212 --- orig/libavcodec/vc1_asftorcv_bsf.c 1969-12-31 16:00:00.000000000 -0800 212 --- orig/libavcodec/vc1_asftorcv_bsf.c 1969-12-31 16:00:00.000000000 -0800
213 +++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c» 2010-06-17 09:45:06.995230900 -0 700 213 +++ ffmpeg-mt/libavcodec/vc1_asftorcv_bsf.c» 2010-06-24 19:19:24.003226400 -0 700
214 @@ -0,0 +1,88 @@ 214 @@ -0,0 +1,88 @@
215 +/* 215 +/*
216 + * copyright (c) 2010 Google Inc. 216 + * copyright (c) 2010 Google Inc.
217 + * 217 + *
218 + * This file is part of FFmpeg. 218 + * This file is part of FFmpeg.
219 + * 219 + *
220 + * FFmpeg is free software; you can redistribute it and/or 220 + * FFmpeg is free software; you can redistribute it and/or
221 + * modify it under the terms of the GNU Lesser General Public 221 + * modify it under the terms of the GNU Lesser General Public
222 + * License as published by the Free Software Foundation; either 222 + * License as published by the Free Software Foundation; either
223 + * version 2.1 of the License, or (at your option) any later version. 223 + * version 2.1 of the License, or (at your option) any later version.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 + 293 +
294 + ++ctx->frames; 294 + ++ctx->frames;
295 + return 0; 295 + return 0;
296 +} 296 +}
297 + 297 +
298 +AVBitStreamFilter vc1_asftorcv_bsf = { 298 +AVBitStreamFilter vc1_asftorcv_bsf = {
299 + "vc1_asftorcv", 299 + "vc1_asftorcv",
300 + sizeof(ASFTORCVBSFContext), 300 + sizeof(ASFTORCVBSFContext),
301 + asftorcv_filter, 301 + asftorcv_filter,
302 +}; 302 +};
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698