diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:50:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 11:50:17 +0100 |
| commit | 8cc5481d51bf746d9d43348af711dbf201bf336a (patch) | |
| tree | 0a4102445621aecf2e34d8a6ee853e97d73525eb /libavcodec/aac_tablegen_decl.h | |
| parent | 47f1af47b6cb763452c5bab3704ca965fccad25b (diff) | |
| parent | 54b298fe5650c124c29a8283cfd05024ac409d3a (diff) | |
| download | ffmpeg-8cc5481d51bf746d9d43348af711dbf201bf336a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate the deinterlace functions in libavcodec
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac_tablegen_decl.h')
0 files changed, 0 insertions, 0 deletions