OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b7697d2 8058284)
Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:17:34 +0000 (15:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 14:17:34 +0000 (15:17 +0100)
commit4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed
treeeca61ff6a87c57b533b8134d66a0e7be5ea6591atree | snapshot
parentb7697d29ed772dd94cb23400154d3e47e326d151commit | diff
parent8058284ce09030b47512746d726fb2ad3ae8a20fcommit | diff
Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help