1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
Michael Niedermayer 47cc616864 Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'
* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
  png: add a standalone parser

Conflicts:
	Changelog
	libavcodec/png_parser.c
	libavcodec/version.h

See: 2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-17 17:58:53 +01:00
..
2013-12-14 12:13:26 -05:00
2013-12-17 09:34:08 +01:00
2013-12-15 16:53:32 +01:00
2013-12-14 03:01:56 +01:00
2013-12-14 03:01:56 +01:00
2013-12-09 08:41:20 +01:00
2013-12-09 08:41:20 +01:00
2013-12-10 16:18:51 +01:00