diff options
Diffstat (limited to 'libavformat/dnxhddec.c')
| -rw-r--r-- | libavformat/dnxhddec.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavformat/dnxhddec.c b/libavformat/dnxhddec.c index 8bb68145fc..0ad51b597b 100644 --- a/libavformat/dnxhddec.c +++ b/libavformat/dnxhddec.c @@ -3,41 +3,42 @@ * Copyright (c) 2008 Baptiste Coudurier <baptiste.coudurier@gmail.com> * Copyright (c) 2009 Reimar Döffinger <Reimar.Doeffinger@gmx.de> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "rawdec.h" +#include "libavcodec/dnxhddata.h" static int dnxhd_probe(AVProbeData *p) { - static const uint8_t header[] = {0x00,0x00,0x02,0x80,0x01}; int w, h, compression_id; if (p->buf_size < 0x2c) return 0; - if (memcmp(p->buf, header, 5)) + if (ff_dnxhd_parse_header_prefix(p->buf) == 0) return 0; h = AV_RB16(p->buf + 0x18); w = AV_RB16(p->buf + 0x1a); if (!w || !h) return 0; compression_id = AV_RB32(p->buf + 0x28); - if (compression_id < 1237 || compression_id > 1253) + if ((compression_id < 1235 || compression_id > 1260) && + (compression_id < 1270 || compression_id > 1274)) return 0; return AVPROBE_SCORE_MAX; } |