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

Side by Side Diff: chromium/patches/to_upstream/53_matroska_codec_config.patch

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 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
OLDNEW
(Empty)
1 diff -wurp -N orig/libavformat/matroskadec.c ffmpeg/libavformat/matroskadec.c
2 --- orig/libavformat/matroskadec.c 2012-02-01 06:28:26.500764099 -0800
3 +++ ffmpeg/libavformat/matroskadec.c 2012-02-01 08:14:02.540453816 -0800
4 @@ -1542,7 +1542,9 @@ static int matroska_read_header(AVFormat
5 } else if (codec_id == CODEC_ID_RA_144) {
6 track->audio.out_samplerate = 8000;
7 track->audio.channels = 1;
8 - } else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK ||
9 + }
10 +#if CONFIG_RA_288_DECODER || CONFIG_COOK_DECODER || CONFIG_ATRAC3_DECODER || CO NFIG_SIPR_DECODER
11 + else if (codec_id == CODEC_ID_RA_288 || codec_id == CODEC_ID_COOK ||
12 codec_id == CODEC_ID_ATRAC3 || codec_id == CODEC_ID_SIPR) {
13 int flavor;
14 ffio_init_context(&b, track->codec_priv.data,track->codec_priv.size ,
15 @@ -1570,6 +1572,7 @@ static int matroska_read_header(AVFormat
16 extradata_offset = 78;
17 }
18 }
19 +#endif
20 track->codec_priv.size -= extradata_offset;
21
22 if (codec_id == CODEC_ID_NONE)
23 @@ -1887,6 +1890,7 @@ static int matroska_parse_block(Matroska
24
25 if (res == 0) {
26 for (n = 0; n < laces; n++) {
27 +#if CONFIG_RA_288_DECODER || CONFIG_COOK_DECODER || CONFIG_ATRAC3_DECODER || CO NFIG_SIPR_DECODER
28 if ((st->codec->codec_id == CODEC_ID_RA_288 ||
29 st->codec->codec_id == CODEC_ID_COOK ||
30 st->codec->codec_id == CODEC_ID_SIPR ||
31 @@ -1933,7 +1937,9 @@ static int matroska_parse_block(Matroska
32 pkt->stream_index = st->index;
33 dynarray_add(&matroska->packets,&matroska->num_packets,pkt) ;
34 }
35 - } else {
36 + } else
37 +#endif
38 + {
39 MatroskaTrackEncoding *encodings = track->encodings.elem;
40 int offset = 0, pkt_size = lace_size[n];
41 uint8_t *pkt_data = data;
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698