[FFmpeg-cvslog] jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number
Peter Ross
git
Sun Mar 13 02:09:34 CET 2011
ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Mar 12 13:31:40 2011 +1100| [57d63d43cf508ae99c3a536d8c63d67cd26c628a] | committer: Michael Niedermayer
jv demuxer: define JV_PREAMBLE_SIZE instead of hard coding the number
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=57d63d43cf508ae99c3a536d8c63d67cd26c628a
---
libavformat/jvdec.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c
index 98fa6e7..314a341 100644
--- a/libavformat/jvdec.c
+++ b/libavformat/jvdec.c
@@ -28,6 +28,8 @@
#include "libavutil/intreadwrite.h"
#include "avformat.h"
+#define JV_PREAMBLE_SIZE 5
+
typedef struct {
int audio_size; /** audio packet size (bytes) */
int video_size; /** video packet size (bytes) */
@@ -154,15 +156,15 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
jv->state++;
if (jvf->video_size || jvf->palette_size) {
int size = jvf->video_size + jvf->palette_size;
- if (av_new_packet(pkt, size + 5))
+ if (av_new_packet(pkt, size + JV_PREAMBLE_SIZE))
return AVERROR(ENOMEM);
AV_WL32(pkt->data, jvf->video_size);
pkt->data[4] = jvf->video_type;
- if (avio_read(pb, pkt->data + 5, size) < 0)
+ if (avio_read(pb, pkt->data + JV_PREAMBLE_SIZE, size) < 0)
return AVERROR(EIO);
- pkt->size = size + 5;
+ pkt->size = size + JV_PREAMBLE_SIZE;
pkt->stream_index = 1;
pkt->pts = jv->pts;
if (jvf->video_type != 1)
More information about the ffmpeg-cvslog
mailing list