diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:34:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-01 16:34:20 +0200 |
commit | 79d0e164cfef96d77cca5b056fcf097a4c63a28e (patch) | |
tree | 072a97f55935c1e84689896c293f5a2459f193d4 /libavformat/mxf.h | |
parent | 96cea6269ac378f848a054ba8cff532734653662 (diff) | |
parent | 4da8cdbb91ddbac118b79076cad4dc28ba72e86f (diff) | |
download | ffmpeg-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 'libavformat/mxf.h')
0 files changed, 0 insertions, 0 deletions