OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 22:04:05 +0000 (23:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 22:04:05 +0000 (23:04 +0100)
commit830be99ae1679f852ef3bb7da427579008aa3887
treeacf38b499068047715af17c2d70a7a57ecc80c11
parentb58c1dd63268e6805fd3423bdecb8f4530e1cae2
parent97d19c2fec351093652b9eef8ef030227aec57df
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dv: Split off DV video encoder into its own file

Conflicts:
libavcodec/dv.c

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