Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 17:13:34 +0000 (19:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 17:13:34 +0000 (19:13 +0200)
commit3ac51145304f9996152a80f5a191ced7b857a252
tree4dfcddd2c641e53647a105fab3f32eede7173557
parent6d2df3c00a7899e9c06e3a460d64e4d0ccde0fae
parente63b818dbe6060b606ae10eb184859f8b97d2353
Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'

* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
  dv: Properly split decoder and encoder initialization

Conflicts:
libavcodec/dv.c

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