Originally committed as revision 11758 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent 4bae195ff5
commit 095f08d599
  1. 4
      libavcodec/dv.c
  2. 2
      libavcodec/dvdata.h

@ -363,7 +363,7 @@ static inline void bit_copy(PutBitContext *pb, GetBitContext *gb)
/* mb_x and mb_y are in units of 8 pixels */ /* mb_x and mb_y are in units of 8 pixels */
static inline void dv_decode_video_segment(DVVideoContext *s, static inline void dv_decode_video_segment(DVVideoContext *s,
uint8_t *buf_ptr1, const uint8_t *buf_ptr1,
const uint16_t *mb_pos_ptr) const uint16_t *mb_pos_ptr)
{ {
int quant, dc, dct_mode, class1, j; int quant, dc, dct_mode, class1, j;
@ -372,7 +372,7 @@ static inline void dv_decode_video_segment(DVVideoContext *s,
int c_offset; int c_offset;
uint8_t *y_ptr; uint8_t *y_ptr;
void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block);
uint8_t *buf_ptr; const uint8_t *buf_ptr;
PutBitContext pb, vs_pb; PutBitContext pb, vs_pb;
GetBitContext gb; GetBitContext gb;
BlockInfo mb_data[5 * 6], *mb, *mb1; BlockInfo mb_data[5 * 6], *mb, *mb1;

@ -2661,7 +2661,7 @@ enum dv_pack_type {
/* largest possible DV frame, in bytes (PAL 50Mbps) */ /* largest possible DV frame, in bytes (PAL 50Mbps) */
#define DV_MAX_FRAME_SIZE 288000 #define DV_MAX_FRAME_SIZE 288000
static inline const DVprofile* dv_frame_profile(uint8_t* frame) static inline const DVprofile* dv_frame_profile(const uint8_t* frame)
{ {
if ((frame[3] & 0x80) == 0) { /* DSF flag */ if ((frame[3] & 0x80) == 0) { /* DSF flag */
/* it's an NTSC format */ /* it's an NTSC format */

Loading…
Cancel
Save