1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
Michael Niedermayer 688c3d944d 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>
2013-12-14 13:09:30 +01:00
..
2013-11-03 00:58:31 +01:00
2013-11-03 00:58:31 +01:00
2013-12-11 21:13:51 +01:00
2013-11-04 15:38:52 +01:00
2013-10-23 14:32:04 +02:00
2013-11-22 17:16:11 +01:00
2013-11-03 00:59:38 +01:00
2013-11-03 00:59:38 +01:00