OSDN Git Service

Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 12:50:31 +0000 (14:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 12:50:31 +0000 (14:50 +0200)
commitd0ac26a264e5b9d5d7d19efddd7205faf1e124d4
tree707b773735563ba2dbde55b91ce0adc8f21a8903
parenta65bc2712db20207dc1065ba3e3e6fa341145d99
parentc692957c4edd119920cd7f2121628dd183589e6a
Merge commit 'c692957c4edd119920cd7f2121628dd183589e6a'

* commit 'c692957c4edd119920cd7f2121628dd183589e6a':
  lavu: remove disabled avoptions cruft
  lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/version.h