]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'
authorClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:48:53 +0000 (11:48 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 29 Jun 2016 09:48:53 +0000 (11:48 +0200)
* commit '81f769fa129edc51c28285649c2df6da717e718f':
  gsm: Move requant_tab table to the gsm tables file

Merged-by: Clément Bœsch <clement@stupeflix.com>
1  2 
libavcodec/gsmdec_data.c
libavcodec/gsmdec_data.h
libavcodec/gsmdec_template.c

Simple merge
Simple merge
Simple merge