]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b666e81 a64a577)
Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 20:24:12 +0000 (22:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 20:24:12 +0000 (22:24 +0200)
* commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81':
  pixfmt: remove misleading and broken documentation

Conflicts:
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/pixfmt.h patch | diff1 | diff2 | blob | history

diff --cc libavutil/pixfmt.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.