Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Nov 2013 11:32:37 +0000 (12:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Nov 2013 11:52:19 +0000 (12:52 +0100)
commite28130bcaf48281b431ea611a546e7520bb90dda
treee140a1521940e41ec255f29dfc832c4d641a651e
parent3e78ceadf913a7a9d027e21f67c6f9767f83996b
parent3cbe1126530449336e2ce59b194bdb8c4eb4abb4
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>
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dvdata.h
libavcodec/dvdec.c
libavformat/dv.c
libavformat/dvenc.c