generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
37,466 Commits 24 Branches 241 Tags
Commit Graph

15 Commits

Author SHA1 Message Date
Michael Niedermayer
568e9062bd Merge remote-tracking branch 'qatar/release/0.8' into release/0.10 
* qatar/release/0.8: (154 commits)
  Update Changelog for the 0.8.1 Release
  dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2
  dca: don't use av_clip_uintp2().
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  h264: increase reference poc list from 16 to 32.
  h264: stricter reference limit enforcement.
  h264: improve parsing of broken AVC SPS
  Replace computations of remaining bits with calls to get_bits_left().
  png: convert to bytestream2 API.
  roqvideo: convert to bytestream2 API.
  smc: port to bytestream2 API.
  tgq: convert to bytestream2 API.
  algmm: convert to bytestream2 API.
  jvdec: unbreak video decoding
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  avconv: reindent
  ...

Conflicts:
	Changelog
	RELEASE
	avconv.c
	doc/APIchanges
	ffplay.c
	libavcodec/Makefile
	libavcodec/aacdec.c
	libavcodec/alsdec.c
	libavcodec/atrac3.c
	libavcodec/avcodec.h
	libavcodec/dvdata.c
	libavcodec/fraps.c
	libavcodec/golomb.h
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_direct.c
	libavcodec/h264_parser.c
	libavcodec/h264_ps.c
	libavcodec/h264idct_template.c
	libavcodec/indeo3.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/mjpegbdec.c
	libavcodec/mmvideo.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo.h
	libavcodec/options.c
	libavcodec/pngdec.c
	libavcodec/roqvideodec.c
	libavcodec/shorten.c
	libavcodec/svq3.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavcodec/xxan.c
	libavformat/Makefile
	libavformat/asfdec.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/nsvdec.c
	libavformat/utils.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/error.c
	libavutil/error.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-16 09:01:08 +01:00
Baptiste Coudurier
6d4c49a2af Move png mmx functions into x86/png_mmx.c, remove them from DSPContext. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 20:08:09 +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ò
ff0d737d6e Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f2e246f576cd53e75b3696e1db418be98fbda76f)
 2011-01-26 03:43:32 +01:00
Diego Elio Pettenò
f2e246f576 Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c. 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-25 21:48:03 +01:00
Måns Rullgård
3da1180409 Move some prototypes from dsputil.c to reasonable header files 
Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:45 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation 
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 10:21:33 +00:00
Loren Merritt
4a5b619df7 png filters 
Originally committed as revision 12195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 10:34:23 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Måns Rullgård
cb762e3955 remove superfluous #include 
Originally committed as revision 9690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-15 19:32:31 +00:00
Måns Rullgård
e0eddd1269 hardly anything in PNGContext is shared; split it 
Originally committed as revision 9689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-15 19:23:55 +00:00
Måns Rullgård
b958a7f111 separate en/decoder specific parts from png.c 
Originally committed as revision 9686 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-15 18:24:26 +00:00