Michael Niedermayer 1c60956c80 Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201' ...

* commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201':
  lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft

Conflicts:
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-03-13 12:21:43 +01:00

9.8 KiB

Raw Blame History

View Raw