From 36ef5369ee9b336febc2c270f8718cec4476cb85 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 5 Aug 2012 11:11:04 +0200 Subject: Replace all CODEC_ID_* with AV_CODEC_ID_* --- libavformat/nut.c | 118 +++++++++++++++++++++++++++--------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) (limited to 'libavformat/nut.c') diff --git a/libavformat/nut.c b/libavformat/nut.c index ac62d4ff4c..4e46b984b4 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -25,68 +25,68 @@ #include "internal.h" const AVCodecTag ff_nut_subtitle_tags[] = { - { CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, - { CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) }, - { CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, - { CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, - { CODEC_ID_NONE , 0 } + { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_SSA , MKTAG('S', 'S', 'A', 0 ) }, + { AV_CODEC_ID_DVD_SUBTITLE, MKTAG('D', 'V', 'D', 'S') }, + { AV_CODEC_ID_DVB_SUBTITLE, MKTAG('D', 'V', 'B', 'S') }, + { AV_CODEC_ID_NONE , 0 } }; const AVCodecTag ff_nut_video_tags[] = { - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, - { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, - { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, - { CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, - { CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, - { CODEC_ID_NONE , 0 } + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '2', '2', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '0', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('4', '4', '4', 'P') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '1', 'W', '0') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '0', 'W', '1') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 4 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 10 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(10 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '1', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 0 , 16 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG(16 , 0 , '3', 'Y') }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 , 8 ) }, + { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '2', 0 , 8 ) }, + { AV_CODEC_ID_NONE , 0 } }; void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ -- cgit v1.2.3