Delete unnecessary 'extern' keywords.

[ffmpeg] / libavformat / nuv.c

diff --git a/libavformat/nuv.c b/libavformat/nuv.c
index eb38d6ffd8544363728268c764524f671581c53d..bd988398ffa8dd29fa2640726524f274e72c58e5 100644 (file)
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -85,17 +85,19 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst,
                     vst->codec->codec_tag = get_le32(pb);
                     vst->codec->codec_id =
                         codec_get_id(codec_bmp_tags, vst->codec->codec_tag);
+                    if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'))
+                        vst->codec->codec_id = CODEC_ID_NUV;
                 } else
                     url_fskip(pb, 4);
 
                 if (ast) {
                     ast->codec->codec_tag = get_le32(pb);
                     ast->codec->sample_rate = get_le32(pb);
-                    ast->codec->bits_per_sample = get_le32(pb);
+                    ast->codec->bits_per_coded_sample = get_le32(pb);
                     ast->codec->channels = get_le32(pb);
                     ast->codec->codec_id =
                         wav_codec_get_id(ast->codec->codec_tag,
-                                         ast->codec->bits_per_sample);
+                                         ast->codec->bits_per_coded_sample);
                     ast->need_parsing = AVSTREAM_PARSE_FULL;
                 } else
                     url_fskip(pb, 4 * 4);
@@ -118,7 +120,7 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst,
 
 static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
     NUVContext *ctx = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     char id_string[12], version_string[5];
     double aspect, fps;
     int is_mythtv, width, height, v_packs, a_packs;
@@ -135,6 +137,8 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
     get_byte(pb); // 'P' == progressive, 'I' == interlaced
     url_fskip(pb, 3); // padding
     aspect = av_int2dbl(get_le64(pb));
+    if (aspect > 0.9999 && aspect < 1.0001)
+        aspect = 4.0 / 3.0;
     fps = av_int2dbl(get_le64(pb));
 
     // number of packets per stream type, -1 means unknown, e.g. streaming
@@ -147,13 +151,14 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
     if (v_packs) {
         ctx->v_id = stream_nr++;
         vst = av_new_stream(s, ctx->v_id);
+        if (!vst)
+            return AVERROR(ENOMEM);
         vst->codec->codec_type = CODEC_TYPE_VIDEO;
         vst->codec->codec_id = CODEC_ID_NUV;
-        vst->codec->codec_tag = MKTAG('R', 'J', 'P', 'G');
         vst->codec->width = width;
         vst->codec->height = height;
-        vst->codec->bits_per_sample = 10;
-        vst->codec->sample_aspect_ratio = av_d2q(aspect, 10000);
+        vst->codec->bits_per_coded_sample = 10;
+        vst->sample_aspect_ratio = av_d2q(aspect * height / width, 10000);
         vst->r_frame_rate = av_d2q(fps, 60000);
         av_set_pts_info(vst, 32, 1, 1000);
     } else
@@ -162,20 +167,21 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
     if (a_packs) {
         ctx->a_id = stream_nr++;
         ast = av_new_stream(s, ctx->a_id);
+        if (!ast)
+            return AVERROR(ENOMEM);
         ast->codec->codec_type = CODEC_TYPE_AUDIO;
         ast->codec->codec_id = CODEC_ID_PCM_S16LE;
         ast->codec->channels = 2;
         ast->codec->sample_rate = 44100;
         ast->codec->bit_rate = 2 * 2 * 44100 * 8;
         ast->codec->block_align = 2 * 2;
-        ast->codec->bits_per_sample = 16;
+        ast->codec->bits_per_coded_sample = 16;
         av_set_pts_info(ast, 32, 1, 1000);
     } else
         ctx->a_id = -1;
 
     get_codec_data(pb, vst, ast, is_mythtv);
-    ctx->rtjpg_video = vst->codec->codec_id == CODEC_ID_NUV;
-    ctx->rtjpg_video |= vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G');
+    ctx->rtjpg_video = vst && vst->codec->codec_id == CODEC_ID_NUV;
     return 0;
 }
 
@@ -183,7 +189,7 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
 
 static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
     NUVContext *ctx = s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     uint8_t hdr[HDRSIZE];
     frametype_t frametype;
     int ret, size;
@@ -238,7 +244,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) {
 
 AVInputFormat nuv_demuxer = {
     "nuv",
-    "NuppelVideo format",
+    NULL_IF_CONFIG_SMALL("NuppelVideo format"),
     sizeof(NUVContext),
     nuv_probe,
     nuv_header,