diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-24 17:25:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-24 17:25:34 +0200 |
commit | e27f781aeb74e6c2b072634658a783ff8b04764b (patch) | |
tree | 5fa779b67d849e79d6e9938835581e5d50d83fa2 /libavcodec/g723_1.c | |
parent | 3cd252d29a152743a8ad0493b8bfcb3ccb89062c (diff) | |
parent | c463dfc7e49929a9891884312b23b27d14729c51 (diff) | |
download | ffmpeg-e27f781aeb74e6c2b072634658a783ff8b04764b.tar.gz |
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g723_1.c')
0 files changed, 0 insertions, 0 deletions