git.osdn.net Git - android-x86/external-ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 2 Dec 2013 19:24:02 +0000 (20:24 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 2 Dec 2013 19:24:02 +0000 (20:24 +0100)
commit	b58c1dd63268e6805fd3423bdecb8f4530e1cae2
tree	f5103eae89c6f802faf1fd7887872e7567caf81c	tree \| snapshot
parent	6f9be8120d2933268733eded5d6c0eb92341e788	commit \| diff
parent	21710ea82118c9d19bea9277b2a85a33096fdd95	commit \| diff

Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'

* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
dv: Move DV VLC data tables out of header file

Conflicts:
libavcodec/dv_vlc_data.h

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

external/ffmpeg

About OSDN

Find Software

Develop Software

Help