projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e03f093 80035db)
Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:43:19 +0000 (02:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 00:44:00 +0000 (02:44 +0200)
* commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e':
  lavu: add missing formats to av_pix_fmt_swap_endianness

Conflicts:
libavutil/pixdesc.c

No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually

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

Trivial merge
FFmpeg git repo