diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 13:43:18 +0200 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 13:43:18 +0200 |
commit | cea5e7355c58004605321295b7a506052292dbbc (patch) | |
tree | 2762cd1cb9f18efe47fe8a888d443893a2a24222 /libavcodec/cdxl.c | |
parent | 527f89e05922e840083ac6d49eeb838b1e350dd4 (diff) | |
parent | 2a2889e130fee6d3c11e506328388afb317626ed (diff) | |
download | ffmpeg-streaming-cea5e7355c58004605321295b7a506052292dbbc.zip ffmpeg-streaming-cea5e7355c58004605321295b7a506052292dbbc.tar.gz |
Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'
* commit '2a2889e130fee6d3c11e506328388afb317626ed':
build: Remove stray duplicate conditional variable declaration
This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36edcd05b53a56ee359d9559cc4e11597)
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/cdxl.c')
0 files changed, 0 insertions, 0 deletions