Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n2.4
| @@ -22,7 +22,7 @@ | |||||
| #include "img2.h" | #include "img2.h" | ||||
| #include "libavcodec/bytestream.h" | #include "libavcodec/bytestream.h" | ||||
| static int brender_read_probe(AVProbeData *p) | |||||
| static int alias_pix_read_probe(AVProbeData *p) | |||||
| { | { | ||||
| const uint8_t *b = p->buf; | const uint8_t *b = p->buf; | ||||
| const uint8_t *end = b + p->buf_size; | const uint8_t *end = b + p->buf_size; | ||||
| @@ -58,7 +58,7 @@ AVInputFormat ff_image2_alias_pix_demuxer = { | |||||
| .name = "alias_pix", | .name = "alias_pix", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), | .long_name = NULL_IF_CONFIG_SMALL("Alias/Wavefront PIX image"), | ||||
| .priv_data_size = sizeof(VideoDemuxData), | .priv_data_size = sizeof(VideoDemuxData), | ||||
| .read_probe = brender_read_probe, | |||||
| .read_probe = alias_pix_read_probe, | |||||
| .read_header = ff_img_read_header, | .read_header = ff_img_read_header, | ||||
| .read_packet = ff_img_read_packet, | .read_packet = ff_img_read_packet, | ||||
| .raw_codec_id = AV_CODEC_ID_ALIAS_PIX, | .raw_codec_id = AV_CODEC_ID_ALIAS_PIX, | ||||
| @@ -22,7 +22,7 @@ | |||||
| #include "img2.h" | #include "img2.h" | ||||
| #include "libavutil/intreadwrite.h" | #include "libavutil/intreadwrite.h" | ||||
| static int aliaspix_read_probe(AVProbeData *p) | |||||
| static int brender_read_probe(AVProbeData *p) | |||||
| { | { | ||||
| static const uint8_t brender_magic[16] = { | static const uint8_t brender_magic[16] = { | ||||
| 0,0,0,0x12,0,0,0,8,0,0,0,2,0,0,0,2 | 0,0,0,0x12,0,0,0,8,0,0,0,2,0,0,0,2 | ||||
| @@ -49,7 +49,7 @@ AVInputFormat ff_image2_brender_pix_demuxer = { | |||||
| .name = "brender_pix", | .name = "brender_pix", | ||||
| .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), | .long_name = NULL_IF_CONFIG_SMALL("BRender PIX image"), | ||||
| .priv_data_size = sizeof(VideoDemuxData), | .priv_data_size = sizeof(VideoDemuxData), | ||||
| .read_probe = aliaspix_read_probe, | |||||
| .read_probe = brender_read_probe, | |||||
| .read_header = ff_img_read_header, | .read_header = ff_img_read_header, | ||||
| .read_packet = ff_img_read_packet, | .read_packet = ff_img_read_packet, | ||||
| .raw_codec_id = AV_CODEC_ID_BRENDER_PIX, | .raw_codec_id = AV_CODEC_ID_BRENDER_PIX, | ||||