summaryrefslogtreecommitdiffstats
path: root/video/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-11 01:48:12 +0100
committerwm4 <wm4@nowhere>2014-01-11 01:49:20 +0100
commit3433f25697fb46ee574ac4f90fa919834e7e7ee2 (patch)
treead8a4a6600a68fcdc6be73be7e41b7163b3637d3 /video/decode
parent589f4871ea0ef4e95065906192f7329096e33ab0 (diff)
downloadmpv-3433f25697fb46ee574ac4f90fa919834e7e7ee2.tar.bz2
mpv-3433f25697fb46ee574ac4f90fa919834e7e7ee2.tar.xz
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.
Diffstat (limited to 'video/decode')
-rw-r--r--video/decode/vd_lavc.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 74bffb23b7..df0c098155 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -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));