diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-24 07:36:02 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-25 14:38:22 -0500 |
| commit | 0abdb2931719d96dee725e555e9b46b2b2f8a6be (patch) | |
| tree | 754205c09fa6f9b77b1700cffec28828d539d5e3 /libavformat/img2.c | |
| parent | 7e06e0ede3b798f591634b277e8dfa6507b196de (diff) | |
| download | ffmpeg-0abdb2931719d96dee725e555e9b46b2b2f8a6be.tar.gz | |
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 25ed2b32e8..a9a4a49023 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -23,6 +23,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/avstring.h" #include "avformat.h" +#include "avio_internal.h" #include <strings.h> typedef struct { @@ -383,13 +384,13 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c')) goto error; avio_wb32(pb[0], 12); - put_tag (pb[0], "jP "); + ffio_wfourcc(pb[0], "jP "); avio_wb32(pb[0], 0x0D0A870A); // signature avio_wb32(pb[0], 20); - put_tag (pb[0], "ftyp"); - put_tag (pb[0], "jp2 "); + ffio_wfourcc(pb[0], "ftyp"); + ffio_wfourcc(pb[0], "jp2 "); avio_wb32(pb[0], 0); - put_tag (pb[0], "jp2 "); + ffio_wfourcc(pb[0], "jp2 "); avio_write(pb[0], st->codec->extradata, st->codec->extradata_size); }else if(pkt->size < 8 || (!st->codec->extradata_size && |