1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
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-03-25 15:47:55 +01:00
2014-03-06 00:30:27 +01:00
2014-02-28 00:07:31 +01:00
2014-03-11 13:22:49 +01:00
2014-03-22 01:26:48 +01:00
2014-02-24 02:24:21 +01:00
2014-02-05 22:36:42 +01:00
2014-03-25 15:47:55 +01:00
2014-02-09 14:29:07 +00:00
2014-03-25 13:29:29 +01:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-03-25 15:47:55 +01:00