diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:03:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-05 15:03:52 +0200 |
| commit | 1efc08921868c882427444e2beb9832e221b24cd (patch) | |
| tree | 0ae46d681cf8dbdbd7161b0c4c754acaabcd2d56 /libavcodec/gsm_parser.c | |
| parent | 1f40536ccaeac488fb0766da7ed05a13bf5263ba (diff) | |
| parent | 65ed9e7585e86e6c728bc762ac9944b157e39f8d (diff) | |
| download | ffmpeg-1efc08921868c882427444e2beb9832e221b24cd.tar.gz | |
Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
avconv: rename 'codec' to 'enc_ctx'
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/gsm_parser.c')
0 files changed, 0 insertions, 0 deletions