Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:37:03 +0000 (12:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 11:37:03 +0000 (12:37 +0100)
commit06a83505992d5f49846c18507a6c3eb8a47c650e
treedda157473729622e9797446d4b717f5dab0a9b1c
parent256e1f7bdfb0f84c7854b6e4147a8b349e12a905
parent7b486ab13bfcfa88a7cd92586de50e49966ec292
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'

* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
  lavf: remove disabled FF_API_AV_GETTIME cruft
  lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h
libavformat/mux.c
libavformat/utils.c
libavformat/version.h