diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 17:15:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 17:15:39 +0200 |
| commit | c2b1225c16f14a23a89c3eedbae51e6bc5667bc8 (patch) | |
| tree | 9583a2d158a75ff29105beb85388c4cc01157d40 /libavcodec/g723_1.c | |
| parent | afa7ab557a801d54a4c3dbab38350f858efbbd5f (diff) | |
| parent | 778111592bf5f38630858ee6dfcfd097cd6c6da9 (diff) | |
| download | ffmpeg-c2b1225c16f14a23a89c3eedbae51e6bc5667bc8.tar.gz | |
Merge commit '778111592bf5f38630858ee6dfcfd097cd6c6da9'
* commit '778111592bf5f38630858ee6dfcfd097cd6c6da9':
dvenc: initialize the profile only once, at init
Conflicts:
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
0 files changed, 0 insertions, 0 deletions