Commit Graph

12 Commits

Author SHA1 Message Date
Michael Niedermayer bf8bb94322 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>
2011-05-22 04:53:19 +02:00
Diego Biurrun 153382e1b6 multiple inclusion guard cleanup
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
2011-05-21 13:48:10 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò 6a495e986f Make inter_rvlc and intra_rvlc static tables.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 84ae8936f6)
2011-02-06 20:31:47 +01:00
Diego Elio Pettenò 84ae8936f6 Make inter_rvlc and intra_rvlc static tables.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 09:53:33 -05:00
Måns Rullgård 9c9a0840d0 Add lots of missing includes
Originally committed as revision 22337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:52 +00:00
Michael Niedermayer 0366b6e199 Make some tables static again, i mistakely thought they would be used in several
places.

Originally committed as revision 21111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-09 17:22:37 +00:00
Michael Niedermayer a7ac9c2f62 Move 3 direct MV related functions that i left out from h263.c to mpeg4video.c.
Originally committed as revision 21104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 19:59:51 +00:00
Michael Niedermayer fef59a5b4b Rename mpeg4 intra vlc tables so they contain "mpeg4", this improves readability
of msmpeg4 code (one now knows where that table comes from).

Originally committed as revision 21097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 17:41:14 +00:00
Michael Niedermayer 05b858b045 Rename DCtab_*, its a global variable and it helps understanding if mpeg4
is in its name.

Originally committed as revision 21096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 17:28:43 +00:00
Michael Niedermayer 28fbbee15f Remove useless line.
Originally committed as revision 21092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 16:26:44 +00:00
Michael Niedermayer ca334dd14b Split the mpeg4 encoder and decoder off h263.c
Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 23:53:49 +00:00