OSDN Git Service

Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:21:43 +0000 (12:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:21:43 +0000 (12:21 +0100)
commit1c60956c80376884502e797f613ec24cacba3cce
tree1618cd51870a2fc2c6a1fe312b457a0cf75fd709
parentac45921a6b9dfbd3074c8a760038eca5a40eb05d
parentc7e044c61bb08b3a6e1e8063e8f4449c88b01201
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>
libavformat/allformats.c
libavformat/hlsproto.c
libavformat/version.h