mirror of
https://github.com/mpv-player/mpv
synced 2024-09-09 01:16:56 +02:00
vd_lavc: matroska: remove weird code setting extra_huff for mjpeg
Like with the previous commit, this is probably not needed, but it's unclear whether that really is the case. Most likely, it used to be needed by some demuxer, and now the only demuxer left that could _possibly_ trigger this is demux_mkv.c. Note that mjpeg is the only decoder that reads the extra_huff option, and nothing in libavformat actually sets the option. So maybe it's fundamentally not needed anymore.
This commit is contained in:
parent
589f4871ea
commit
3433f25697
@ -307,18 +307,6 @@ static int init(struct dec_video *vd, const char *decoder)
|
||||
static void set_from_bih(AVCodecContext *avctx, uint32_t format,
|
||||
MP_BITMAPINFOHEADER *bih)
|
||||
{
|
||||
|
||||
switch (format) {
|
||||
case MP_FOURCC('S','V','Q','3'):
|
||||
case MP_FOURCC('A','V','R','n'):
|
||||
case MP_FOURCC('M','J','P','G'):
|
||||
/* AVRn stores huffman table in AVI header */
|
||||
/* Pegasus MJPEG stores it also in AVI header, but it uses the common
|
||||
* MJPG fourcc :( */
|
||||
av_opt_set_int(avctx, "extern_huff", 1, AV_OPT_SEARCH_CHILDREN);
|
||||
break;
|
||||
}
|
||||
|
||||
if (bih->biSize > sizeof(*bih))
|
||||
mp_lavc_set_extradata(avctx, bih + 1, bih->biSize - sizeof(*bih));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user