diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 23:34:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 23:35:08 +0100 |
| commit | 1dc1c4e7a82edb13420f064890fbde3751ca18c9 (patch) | |
| tree | 753d0901163e607d9a4ecb73b19b3f88e0af2399 /libavcodec/aac_tablegen.c | |
| parent | 741b56fceece2b2de53466b952ed60b61544cc60 (diff) | |
| parent | a6653787a4b1e89170ff7962312dd110769c83a3 (diff) | |
| download | ffmpeg-1dc1c4e7a82edb13420f064890fbde3751ca18c9.tar.gz | |
Merge commit 'a6653787a4b1e89170ff7962312dd110769c83a3'
* commit 'a6653787a4b1e89170ff7962312dd110769c83a3':
libopencv: Check kernel_str life cycle
Conflicts:
libavfilter/vf_libopencv.c
See: f16a6f667c993a158643b52815ec42961508b0a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_tablegen.c')
0 files changed, 0 insertions, 0 deletions