Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(892)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/mjpegdec.h

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * MJPEG decoder 2 * MJPEG decoder
3 * Copyright (c) 2000, 2001 Fabrice Bellard 3 * Copyright (c) 2000, 2001 Fabrice Bellard
4 * Copyright (c) 2003 Alex Beregszaszi 4 * Copyright (c) 2003 Alex Beregszaszi
5 * Copyright (c) 2003-2004 Michael Niedermayer 5 * Copyright (c) 2003-2004 Michael Niedermayer
6 * 6 *
7 * This file is part of FFmpeg. 7 * This file is part of FFmpeg.
8 * 8 *
9 * FFmpeg is free software; you can redistribute it and/or 9 * FFmpeg is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 26 matching lines...) Expand all
37 37
38 typedef struct MJpegDecodeContext { 38 typedef struct MJpegDecodeContext {
39 AVCodecContext *avctx; 39 AVCodecContext *avctx;
40 GetBitContext gb; 40 GetBitContext gb;
41 41
42 int start_code; /* current start code */ 42 int start_code; /* current start code */
43 int buffer_size; 43 int buffer_size;
44 uint8_t *buffer; 44 uint8_t *buffer;
45 45
46 int16_t quant_matrixes[4][64]; 46 int16_t quant_matrixes[4][64];
47 VLC vlcs[2][4]; 47 VLC vlcs[3][4];
48 int qscale[4]; ///< quantizer scale calculated from quant_matrixes 48 int qscale[4]; ///< quantizer scale calculated from quant_matrixes
49 49
50 int org_height; /* size given at codec init */ 50 int org_height; /* size given at codec init */
51 int first_picture; /* true if decoding first picture */ 51 int first_picture; /* true if decoding first picture */
52 int interlaced; /* true if interlaced */ 52 int interlaced; /* true if interlaced */
53 int bottom_field; /* true if bottom field */ 53 int bottom_field; /* true if bottom field */
54 int lossless; 54 int lossless;
55 int ls; 55 int ls;
56 int progressive; 56 int progressive;
57 int rgb; 57 int rgb;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 int ff_mjpeg_decode_end(AVCodecContext *avctx); 111 int ff_mjpeg_decode_end(AVCodecContext *avctx);
112 int ff_mjpeg_decode_frame(AVCodecContext *avctx, 112 int ff_mjpeg_decode_frame(AVCodecContext *avctx,
113 void *data, int *data_size, 113 void *data, int *data_size,
114 AVPacket *avpkt); 114 AVPacket *avpkt);
115 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); 115 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
116 int ff_mjpeg_decode_dht(MJpegDecodeContext *s); 116 int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
117 int ff_mjpeg_decode_sof(MJpegDecodeContext *s); 117 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
118 int ff_mjpeg_decode_sos(MJpegDecodeContext *s); 118 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
119 119
120 #endif /* AVCODEC_MJPEGDEC_H */ 120 #endif /* AVCODEC_MJPEGDEC_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698