summaryrefslogtreecommitdiffstats
path: root/libavfilter/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-01 16:34:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-01 16:34:20 +0200
commit79d0e164cfef96d77cca5b056fcf097a4c63a28e (patch)
tree072a97f55935c1e84689896c293f5a2459f193d4 /libavfilter/version.h
parent96cea6269ac378f848a054ba8cff532734653662 (diff)
parent4da8cdbb91ddbac118b79076cad4dc28ba72e86f (diff)
downloadffmpeg-streaming-79d0e164cfef96d77cca5b056fcf097a4c63a28e.zip
ffmpeg-streaming-79d0e164cfef96d77cca5b056fcf097a4c63a28e.tar.gz
Merge commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f'
* commit '4da8cdbb91ddbac118b79076cad4dc28ba72e86f': tscc: Eliminate pointless variable indirections in decode_frame() Conflicts: libavcodec/tscc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud