diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 00:19:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 00:20:55 +0100 |
| commit | de7b50e9cde715b8ccfef2c83def08b4e8581432 (patch) | |
| tree | 08bd0f618f53712dfcef1ad9df709ec80ea7ae7d /libavcodec/ac3.h | |
| parent | f2387152bcdc4b3a4e650f8b00600796aa0504de (diff) | |
| parent | f777504f640260337974848c7d5d7a3f064bbb45 (diff) | |
| download | ffmpeg-de7b50e9cde715b8ccfef2c83def08b4e8581432.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Lower bound check for slice offsets
Conflicts:
libavcodec/h264.c
See: 91253839e14cce9793ee93f184cef609ca8195d5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3.h')
0 files changed, 0 insertions, 0 deletions