diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-05-22 23:05:43 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-05-22 23:05:43 +0000 |
| commit | 00eed7cc5d4df9d2db17f68d93f3dd62f4b09022 (patch) | |
| tree | b1dbf730c9ef1783a13141ac0f4da1f398829cde /vlc/build/ffmpeg_webm_fix.diff | |
| parent | 81fb5bb914b93861007c3a1bd5d80802f75d44c2 (diff) | |
| download | asb-00eed7cc5d4df9d2db17f68d93f3dd62f4b09022.tar.gz asb-00eed7cc5d4df9d2db17f68d93f3dd62f4b09022.tar.xz | |
Initial revision
Diffstat (limited to 'vlc/build/ffmpeg_webm_fix.diff')
| -rw-r--r-- | vlc/build/ffmpeg_webm_fix.diff | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/vlc/build/ffmpeg_webm_fix.diff b/vlc/build/ffmpeg_webm_fix.diff new file mode 100644 index 00000000..5d0e7518 --- /dev/null +++ b/vlc/build/ffmpeg_webm_fix.diff @@ -0,0 +1,36 @@ +--- libavformat/matroskadec.c.orig 2010-05-23 00:20:56.000000000 +0200 ++++ libavformat/matroskadec.c 2010-05-23 01:04:04.000000000 +0200 +@@ -828,7 +828,7 @@ + /* + * Autodetecting... + */ +-static int matroska_probe(AVProbeData *p) ++static int ebml_probe(AVProbeData *p, const char probe_data[], const int probe_data_size) + { + uint64_t total = 0; + int len_mask = 0x80, size = 1, n = 1, i; +@@ -868,6 +868,24 @@ + return AVPROBE_SCORE_MAX/2; + } + ++/* ++ * Autodetecting... ++ */ ++#if CONFIG_MATROSKA_DEMUXER ++static int matroska_probe(AVProbeData *p) ++{ ++ static const char probe_data[] = "matroska"; ++ return ebml_probe(p, probe_data, sizeof(probe_data)); ++} ++#endif ++#if CONFIG_WEBM_DEMUXER ++static int webm_probe(AVProbeData *p) ++{ ++ static const char probe_data[] = "webm"; ++ return ebml_probe(p, probe_data, sizeof(probe_data)); ++} ++#endif ++ + static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, + int num) + { |