diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 22:07:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 22:41:49 +0100 |
| commit | 59fb3c4be8265bde09fade8af22527b9033acf46 (patch) | |
| tree | 8642dbda19d38082fd54e5be64f5ea76d958fc86 /libavcodec/libopencore-amr.c | |
| parent | 329610303aac5f42a01c16ccb4e9fea2075b38d3 (diff) | |
| parent | 98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791 (diff) | |
| download | ffmpeg-59fb3c4be8265bde09fade8af22527b9033acf46.tar.gz | |
Merge commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791'
* commit '98cc9efc5f6b4dc847ed3b9b60b1c3bcd14e6791':
h264: prevent two matching fields from being both a short/long ref combination
See: 92002db3eb437414281ad4fb6e84e34862f7fc92
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libopencore-amr.c')
0 files changed, 0 insertions, 0 deletions