[FFmpeg-cvslog] isom: add "NO16" FourCC

[Piotr Bandurski]

ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Sun Jul 15 13:25:47 2012 +0200| [96e25073637f1fdc4818e193e74c38570c390d70] | committer: Michael Niedermayer

isom: add "NO16" FourCC

samples:

http://www.datafilehost.com/download-46d9a0fa.html

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=96e25073637f1fdc4818e193e74c38570c390d70
---

 libavcodec/rawdec.c |    2 +-
 libavformat/isom.c  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index ba416db..cabc8c4 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -94,7 +94,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
 {
     RawVideoContext *context = avctx->priv_data;
 
-    if (avctx->codec_tag == MKTAG('r','a','w',' '))
+    if (avctx->codec_tag == MKTAG('r','a','w',' ') || avctx->codec_tag == MKTAG('N','O','1','6'))
         avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample);
     else if (avctx->codec_tag == MKTAG('W','R','A','W'))
         avctx->pix_fmt = ff_find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample);
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0888453..bcd5894 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -86,6 +86,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'b', 'g') },
     { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'r', 'g') },
     { CODEC_ID_RAWVIDEO, MKTAG('b', 'x', 'y', 'v') },
+    { CODEC_ID_RAWVIDEO, MKTAG('N', 'O', '1', '6') },
     { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
     { CODEC_ID_RAWVIDEO, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
     { CODEC_ID_RAWVIDEO, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */