Michael Niedermayer e3ec2cde2c Merge commit 'b94ec30428b9696f99b08055735689623fe63954' ...

* commit 'b94ec30428b9696f99b08055735689623fe63954':
  lavc: Update version and APIchanges

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

2015-07-27 23:21:23 +02:00

89 KiB

Raw Blame History

View Raw