Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:34:20 +0000 (16:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Aug 2014 14:34:20 +0000 (16:34 +0200)
commit79d0e164cfef96d77cca5b056fcf097a4c63a28e
tree072a97f55935c1e84689896c293f5a2459f193d4
parent96cea6269ac378f848a054ba8cff532734653662
parent4da8cdbb91ddbac118b79076cad4dc28ba72e86f
Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

* commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f':
  tscc: Eliminate pointless variable indirections in decode_frame()

Conflicts:
libavcodec/tscc.c

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