diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 22:27:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-15 23:31:51 +0200 |
| commit | 35e0496a7bb7243ce3574ab971bd489c7f7a0876 (patch) | |
| tree | 3c6145906ffd6f4342c9b41d17af6ec78b7e94ad /libavcodec/cabac.h | |
| parent | 88a97d660d65b8d5ac2ca719969c0096ace00114 (diff) | |
| parent | 3892e784f2225b32c87a5996347994f108fbd369 (diff) | |
| download | ffmpeg-35e0496a7bb7243ce3574ab971bd489c7f7a0876.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Improve suggested Emacs settings for our coding style.
utvideo: Remove unused variable 'src_size'
mov: free memory on header parsing failure
mov: fix leaking memory with multiple drefs.
swscale: clip before assigning tables in RGB output functions.
swscale: fix off-by-one in second coefficient in bilinear filters.
Conflicts:
libavformat/mov.c
libswscale/output.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cabac.h')
0 files changed, 0 insertions, 0 deletions