Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:49:36 +0000 (12:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 10:49:36 +0000 (12:49 +0200)
commit065996b9843b6366bab23d0c6adc61c05c0f9f75
treea14a67fa5ddf00dbf4a100298f54abf3b7dc67de
parent1ace588f4a94fa607a42971b59483447647c4727
parent05015d03da1d745bb92915b5cea92dec16af719f
Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

* commit '05015d03da1d745bb92915b5cea92dec16af719f':
  matroska: fix a corner case in ebml-lace parsing
  avfiltergraph: check for sws opts being non-NULL before using them.
  configure: Enable hwaccels without external dependencies by default.
  oma: Validate sample rates

Conflicts:
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
libavformat/matroskadec.c
libavformat/oma.c
libavformat/omadec.c