FFmpeg/libavcodec
Michael Niedermayer 16ddc58bd7 Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
  PAF demuxer and decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/paf.c
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/paf.c
	libavformat/version.h

See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 04:32:05 +01:00
..
2014-03-27 23:34:47 +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-03-27 23:34:47 +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