diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:15:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-06 21:23:29 +0200 |
| commit | 050b48f39783d7af05fc805fc4278a97941e7436 (patch) | |
| tree | 9c4e8488954ed5e7b31b7477c68adfd71f4d3c53 /ffmpeg.c | |
| parent | a06f0cef5bd4bef57338e3396ea903a3d887a0e4 (diff) | |
| parent | 6c5eac9a603a91a707d030d96ba97e2ef6b3ce50 (diff) | |
| download | ffmpeg-streaming-050b48f39783d7af05fc805fc4278a97941e7436.zip ffmpeg-streaming-050b48f39783d7af05fc805fc4278a97941e7436.tar.gz | |
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions
