[FFmpeg-cvslog] Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 16:34:20 2014 +0200| [79d0e164cfef96d77cca5b056fcf097a4c63a28e] | committer: Michael Niedermayer

Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'

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

Conflicts:
	libavcodec/tscc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79d0e164cfef96d77cca5b056fcf097a4c63a28e
---