Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'

* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
  dv: Split DV data table declarations into their own header

Conflicts:
	libavcodec/dvdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dv.c
Simple merge

diff --cc libavcodec/dv.h
index 0000000,79896cb..23dcf63
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/dv.h
+++ b/libavcodec/dv.h
@@@ -1,0 -1,118 +1,115 @@@
 - * This file is part of Libav.
+ /*
+  * Constants for DV codec
+  * Copyright (c) 2002 Fabrice Bellard
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
 -/* minimum number of bytes to read from a DV stream in order to
 -   determine the profile */
 -#define DV_PROFILE_BYTES (6*80) /* 6 DIF blocks */
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ /**
+  * @file
+  * Constants for DV codec.
+  */
+ 
+ #ifndef AVCODEC_DV_H
+ #define AVCODEC_DV_H
+ 
+ #include "avcodec.h"
+ #include "dsputil.h"
+ #include "get_bits.h"
+ #include "dv_profile.h"
+ 
+ typedef struct DVVideoContext {
+     const DVprofile *sys;
+     AVFrame          picture;
+     AVCodecContext  *avctx;
+     uint8_t         *buf;
+ 
+     uint8_t  dv_zigzag[2][64];
+ 
+     void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size);
+     void (*fdct[2])(int16_t *block);
+     void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
+     me_cmp_func ildct_cmp;
+ } DVVideoContext;
+ 
+ enum dv_section_type {
+      dv_sect_header  = 0x1f,
+      dv_sect_subcode = 0x3f,
+      dv_sect_vaux    = 0x56,
+      dv_sect_audio   = 0x76,
+      dv_sect_video   = 0x96,
+ };
+ 
+ enum dv_pack_type {
+      dv_header525     = 0x3f, /* see dv_write_pack for important details on */
+      dv_header625     = 0xbf, /* these two packs */
+      dv_timecode      = 0x13,
+      dv_audio_source  = 0x50,
+      dv_audio_control = 0x51,
+      dv_audio_recdate = 0x52,
+      dv_audio_rectime = 0x53,
+      dv_video_source  = 0x60,
+      dv_video_control = 0x61,
+      dv_video_recdate = 0x62,
+      dv_video_rectime = 0x63,
+      dv_unknown_pack  = 0xff,
+ };
+ 
+ #define DV_PROFILE_IS_HD(p) ((p)->video_stype & 0x10)
+ #define DV_PROFILE_IS_1080i50(p) (((p)->video_stype == 0x14) && ((p)->dsf == 1))
+ #define DV_PROFILE_IS_720p50(p)  (((p)->video_stype == 0x18) && ((p)->dsf == 1))
+ 
+ 
+ /**
+  * largest possible DV frame, in bytes (1080i50)
+  */
+ #define DV_MAX_FRAME_SIZE 576000
+ 
+ /**
+  * maximum number of blocks per macroblock in any DV format
+  */
+ #define DV_MAX_BPM 8
+ 
+ #define TEX_VLC_BITS 9
+ 
+ extern RL_VLC_ELEM ff_dv_rl_vlc[1184];
+ 
+ int ff_dv_init_dynamic_tables(const DVprofile *d);
+ int ff_dvvideo_init(AVCodecContext *avctx);
+ 
+ static inline int dv_work_pool_size(const DVprofile *d)
+ {
+     int size = d->n_difchan*d->difseg_size*27;
+     if (DV_PROFILE_IS_1080i50(d))
+         size -= 3*27;
+     if (DV_PROFILE_IS_720p50(d))
+         size -= 4*27;
+     return size;
+ }
+ 
+ static inline void dv_calculate_mb_xy(DVVideoContext *s, DVwork_chunk *work_chunk, int m, int *mb_x, int *mb_y)
+ {
+      *mb_x = work_chunk->mb_coordinates[m] & 0xff;
+      *mb_y = work_chunk->mb_coordinates[m] >> 8;
+ 
+      /* We work with 720p frames split in half. The odd half-frame (chan==2,3) is displaced :-( */
+      if (s->sys->height == 720 && !(s->buf[1]&0x0C)) {
+          *mb_y -= (*mb_y>17)?18:-72; /* shifting the Y coordinate down by 72/2 macro blocks */
+      }
+ }
+ 
+ #endif /* AVCODEC_DV_H */

diff --cc libavcodec/dvdata.h
index 97c20e3,4869331..cb58002
--- 1/libavcodec/dvdata.h
--- 2/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@@ -1,10 -1,7 +1,7 @@@
  /*
-  * Constants for DV codec
-  * Copyright (c) 2002 Fabrice Bellard
-  *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavcodec/dvdec.c
Simple merge

diff --cc libavformat/dv.c
Simple merge

diff --cc libavformat/dvenc.c
Simple merge