1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
Michael Niedermayer 12ab07be44 Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b':
  Alias PIX image encoder and decoder

Conflicts:
	Changelog
	libavcodec/allcodecs.c
	libavcodec/version.h
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27 01:10:28 +01:00
..
2014-02-17 20:50:33 +01:00
2014-03-22 03:12:18 +01:00
2014-02-07 19:32:16 +00:00
2014-02-18 18:11:23 +01:00
2014-02-06 02:51:19 +01:00
2014-03-25 13:29:05 +01:00
2014-03-26 04:20:52 +01:00
2014-01-31 18:34:14 +01:00
2014-02-21 16:57:26 -03:00
2014-02-21 16:57:26 -03:00
2014-02-10 21:45:55 +01:00
2014-02-10 21:45:55 +01:00
2014-03-16 23:29:51 +01:00
2014-03-16 23:31:29 +01:00
2014-01-27 20:36:42 +01:00
2014-03-25 13:29:05 +01:00
2014-03-25 13:29:05 +01:00
2014-03-25 13:29:05 +01:00