Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 10:29:41 +0000 (12:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 10:30:02 +0000 (12:30 +0200)
commit4c57be124f42ff7e191453f6c482d567ecee8cda
tree10aa04bdba6545f184471155daf4b66ea62ccc19
parentb0458e62c8fc7830da9b096d851219177185e296
parentb97f6ef956293fe06ae1e99bd295f42613081f37
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/pcm-dvd.c