OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbdaebb 0cbb147)
Merge commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 09:34:45 +0000 (11:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Apr 2015 09:49:26 +0000 (11:49 +0200)
* commit '0cbb1473179d35d4eb9c9446c8ed84e197e5389b':
  x264: Map color parameters

Conflicts:
libavcodec/libx264.c

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

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help