summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-08 17:25:13 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-08 17:42:56 +0100
commita30f7918b52d076c55a42bef3a731165b354bf08 (patch)
treef659d43c5ff88425e8d2c740dfe191da87e5988c /LICENSE
parentf8a9cf77040e1b2ed83206269ead11aa30afb98d (diff)
parent0338c396987c82b41d322630ea9712fe5f9561d6 (diff)
downloadffmpeg-streaming-a30f7918b52d076c55a42bef3a731165b354bf08.zip
ffmpeg-streaming-a30f7918b52d076c55a42bef3a731165b354bf08.tar.gz
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
* commit '0338c396987c82b41d322630ea9712fe5f9561d6': dsputil: Split off H.263 bits into their own H263DSPContext Conflicts: configure libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud