Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 01:15:55 +0000 (03:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 01:16:53 +0000 (03:16 +0200)
commit7e8fdf05e09a749ac74cf4b26797e44305a2b068
tree8f0b331dad92f8e8017932bbaf4e5c0d324721fb
parent11ba0c82076dd4b22b5d28ff8004308f6ee99b4e
parent593d2326ef985cdffe413df629419938f7b07c4c
Merge commit '593d2326ef985cdffe413df629419938f7b07c4c'

* commit '593d2326ef985cdffe413df629419938f7b07c4c':
  dv: Replace a magic number by sizeof()

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dv.c