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: 7de4a16508, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-28 04:32:05 +01:00

7.9 KiB

Raw Blame History

View Raw