github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-09 01:36:25 +01:00
Code Releases Activity

demux_mkv: make sure wavpacks works with older libavcodec versions

Browse Source 
The new wavpack packet format (see previous commit) doesn't work with
older libavcodec versions, so disable the new code in this case.

The version numbers are only approximate, since the libavcodec version
wasn't bumped with the wavpack change, but it's close enough.
This commit is contained in:
wm4 2013-05-30 19:55:15 +02:00
parent 3f3531f560
commit c0db930de4
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
demux/demux_mkv.c
View File

@ -33,6 +33,8 @@
#include <libavutil/intreadwrite.h>
#include <libavutil/avstring.h>
#include <libavcodec/version.h>
#include "config.h"
#if CONFIG_ZLIB
@ -73,6 +75,17 @@ static const int cook_fl2bps[COOK_FLAVORS] = {
12016, 16408, 22911, 33506
};
#define IS_LIBAV_FORK (LIBAVCODEC_VERSION_MICRO < 100)
// Both of these versions were bumped by unrelated commits.
#if (IS_LIBAV_FORK && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 7, 1)) || \
(!IS_LIBAV_FORK && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 12, 101))
#define NEED_WAVPACK_PARSE 1
#else
#define NEED_WAVPACK_PARSE 0
#endif
enum {
MAX_NUM_LACES = 256,
};
@ -2140,12 +2153,14 @@ fail:
static void mkv_parse_packet(mkv_track_t *track, bstr *buffer)
{
if (track->a_formattag == mmioFOURCC('W', 'V', 'P', 'K')) {
#if NEED_WAVPACK_PARSE
int size = buffer->len;
uint8_t *parsed;
if (libav_parse_wavpack(track, buffer->start, &parsed, &size) >= 0) {
buffer->start = parsed;
buffer->len = size;
}
#endif
}
}