OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a135bea
)
Set codec_id correctly for RJPG codec_tag
author
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 15 Sep 2007 08:19:01 +0000
(08:19 +0000)
committer
Reimar Döffinger
<Reimar.Doeffinger@gmx.de>
Sat, 15 Sep 2007 08:19:01 +0000
(08:19 +0000)
Originally committed as revision 10498 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/nuv.c
patch
|
blob
|
history
diff --git
a/libavformat/nuv.c
b/libavformat/nuv.c
index
152ef67
..
fe637de
100644
(file)
--- a/
libavformat/nuv.c
+++ b/
libavformat/nuv.c
@@
-85,6
+85,8
@@
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);
@@
-174,7
+176,6
@@
static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) {
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');
return 0;
}