History

Merge remote branch 'qatar/master'

* qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c

Michael Niedermayer committed 15 years ago

Commit d7e5aeb2 parents 93c28a5 79ee89764 files · +804 −421Browse files

Showing the changes to libavcodec/aaccoder.c (1 of 64 files). Show all

Unified · Split

libavcodec/aaccoder.c+1−0
@@ -37,6 +37,7 @@ · 36 unmodified lines
37#include "aac.h"37#include "aac.h"
38#include "aacenc.h"38#include "aacenc.h"
39#include "aactab.h"39#include "aactab.h"
40#include "libavutil/libm.h"
40 41
41/** bits needed to code codebook run value for long windows */42/** bits needed to code codebook run value for long windows */
42static const uint8_t run_value_bits_long[64] = {43static const uint8_t run_value_bits_long[64] = {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t