OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af7949f 582963a)
Merge commit '582963a8156522582e55466be4a59974a8d909a5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)
* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/vdpau_vc1.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/vdpau_vc1.c
Simple merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help