diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-22 04:53:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-22 04:53:19 +0200 |
| commit | bf8bb94322d92134206392c3f238a58c424b1c9e (patch) | |
| tree | 5522036771e42e1e7b539fb190302b530bcb49d0 /libavcodec/flv.h | |
| parent | 33adcdb53118df8f281742b75adf861cda64801a (diff) | |
| parent | 71cc331cab8d61130048f3003f2ca77cfb94e3f3 (diff) | |
| download | ffmpeg-bf8bb94322d92134206392c3f238a58c424b1c9e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: get rid of the -vglobal option.
dct32: Add AVX implementation of 32-point DCT
dct32: Change pass 6 permutation to allow for AVX implementation
dct32: port SSE 32-point DCT to YASM
multiple inclusion guard cleanup
avio: document buffer must created with av_malloc() and friends
avio: check AVIOContext malloc failure
swscale: point out an alternative to sws_getContext
svq3: Do initialization after parsing the extradata
add changelog entries for 0.7_beta2
mp3lame: add #include required for AV_RB32 macro.
Conflicts:
Changelog
libavcodec/svq3.c
libavcodec/x86/dct32_sse.c
libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flv.h')
| -rw-r--r-- | libavcodec/flv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/flv.h b/libavcodec/flv.h index eb10f22608..16bc88b663 100644 --- a/libavcodec/flv.h +++ b/libavcodec/flv.h @@ -30,5 +30,4 @@ void ff_flv2_encode_ac_esc(PutBitContext *pb, int slevel, int level, int run, in int ff_flv_decode_picture_header(MpegEncContext *s); void ff_flv2_decode_ac_esc(GetBitContext *gb, int *level, int *run, int *last); -#endif - +#endif /* AVCODEC_FLV_H */ |