OSDN Git Service

Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 12:03:25 +0000 (13:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 12:09:30 +0000 (13:09 +0100)
commit688c3d944de3828e9cf577f809a9a4b78237247c
tree5ab214076277df3c7daf11cc3448e3432448c985
parentf5013913da3691121df74c7d57a517c1ca279c53
parentc85aad9cb2af459e8306871f76722de440c3ca93
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxy: Define a group for libswscale documentation

Conflicts:
libavutil/avutil.h
libswscale/swscale.h

See: 18d9398143ac63915e85d76447dca5c9670ed58a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avutil.h
libswscale/swscale.h