Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Oct 13, 2012
  1. @michaelni

    Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

    michaelni authored
    * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
      Remove libmpeg2 #define remnants
      De-doxygenize some top-level files
    
    Conflicts:
    	ffmpeg.c
    	ffmpeg.h
    	ffmpeg_filter.c
    	ffplay.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 8, 2012
  1. @michaelni

    Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

    michaelni authored
    * commit '716d413c13981da15323c7a3821860536eefdbbb':
      Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
    
    Conflicts:
    	doc/examples/muxing.c
    	ffmpeg.h
    	ffmpeg_filter.c
    	ffmpeg_opt.c
    	ffplay.c
    	ffprobe.c
    	libavcodec/8bps.c
    	libavcodec/aasc.c
    	libavcodec/aura.c
    	libavcodec/avcodec.h
    	libavcodec/avs.c
    	libavcodec/bfi.c
    	libavcodec/bmp.c
    	libavcodec/bmpenc.c
    	libavcodec/c93.c
    	libavcodec/cscd.c
    	libavcodec/cyuv.c
    	libavcodec/dpx.c
    	libavcodec/dpxenc.c
    	libavcodec/eatgv.c
    	libavcodec/escape124.c
    	libavcodec/ffv1.c
    	libavcodec/flashsv.c
    	libavcodec/fraps.c
    	libavcodec/h264.c
    	libavcodec/huffyuv.c
    	libavcodec/iff.c
    	libavcodec/imgconvert.c
    	libavcodec/indeo3.c
    	libavcodec/kmvc.c
    	libavcodec/libopenjpegdec.c
    	libavcodec/libopenjpegenc.c
    	libavcodec/libx264.c
    	libavcodec/ljpegenc.c
    	libavcodec/mjpegdec.c
    	libavcodec/mjpegenc.c
    	libavcodec/motionpixels.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pamenc.c
    	libavcodec/pcxenc.c
    	libavcodec/pgssubdec.c
    	libavcodec/pngdec.c
    	libavcodec/pngenc.c
    	libavcodec/pnm.c
    	libavcodec/pnmdec.c
    	libavcodec/pnmenc.c
    	libavcodec/ptx.c
    	libavcodec/qdrw.c
    	libavcodec/qpeg.c
    	libavcodec/qtrleenc.c
    	libavcodec/raw.c
    	libavcodec/rawdec.c
    	libavcodec/rl2.c
    	libavcodec/sgidec.c
    	libavcodec/sgienc.c
    	libavcodec/snowdec.c
    	libavcodec/snowenc.c
    	libavcodec/sunrast.c
    	libavcodec/targa.c
    	libavcodec/targaenc.c
    	libavcodec/tiff.c
    	libavcodec/tiffenc.c
    	libavcodec/tmv.c
    	libavcodec/truemotion2.c
    	libavcodec/utils.c
    	libavcodec/vb.c
    	libavcodec/vp3.c
    	libavcodec/wnv1.c
    	libavcodec/xl.c
    	libavcodec/xwddec.c
    	libavcodec/xwdenc.c
    	libavcodec/yop.c
    	libavdevice/v4l2.c
    	libavdevice/x11grab.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/buffersrc.c
    	libavfilter/drawutils.c
    	libavfilter/formats.c
    	libavfilter/src_movie.c
    	libavfilter/vf_ass.c
    	libavfilter/vf_drawtext.c
    	libavfilter/vf_fade.c
    	libavfilter/vf_format.c
    	libavfilter/vf_hflip.c
    	libavfilter/vf_lut.c
    	libavfilter/vf_overlay.c
    	libavfilter/vf_pad.c
    	libavfilter/vf_scale.c
    	libavfilter/vf_transpose.c
    	libavfilter/vf_yadif.c
    	libavfilter/video.c
    	libavfilter/vsrc_testsrc.c
    	libavformat/movenc.c
    	libavformat/mxf.h
    	libavformat/utils.c
    	libavformat/yuv4mpeg.c
    	libavutil/imgutils.c
    	libavutil/pixdesc.c
    	libswscale/input.c
    	libswscale/output.c
    	libswscale/swscale_internal.h
    	libswscale/swscale_unscaled.c
    	libswscale/utils.c
    	libswscale/x86/swscale_template.c
    	libswscale/x86/yuv2rgb.c
    	libswscale/x86/yuv2rgb_template.c
    	libswscale/yuv2rgb.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 2, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      ARM: fix Thumb PIC on Apple
      nut: add do {} while (0) to GET_V
      tiffenc: Check av_malloc() results.
      tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
      Use atexit() instead of defining a custom exit_program() interface.
      msvc: Fix detection of VFW & Avisynth required libs
    
    Conflicts:
    	ffmpeg.c
    	ffmpeg_opt.c
    	ffplay.c
    	ffprobe.c
    	ffserver.c
    	libavcodec/tiffenc.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Sep 18, 2012
  1. @michaelni

    Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

    michaelni authored
    * commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
      alsdec: Check k used for rice decoder.
      avfiltergraph: silence an uninitialized variable warning
      xsubenc: reindent
      lavc: replace AVCodecContext.encode with subtitle-specific callback
      lavc: add const to private codec class initialization.
      avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
      id3v2: strdup the genre name explicitly.
      lavf/id3v2: do not export empty fields.
      buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
      lavfi: replace empty input/output lists with null pointers
    
    Conflicts:
    	ffmpeg_filter.c
    	libavcodec/alsdec.c
    	libavcodec/dvdsubenc.c
    	libavcodec/utils.c
    	libavcodec/v210dec.h
    	libavfilter/af_channelsplit.c
    	libavfilter/avfiltergraph.c
    	libavfilter/buffersrc.c
    	libavfilter/src_movie.c
    	libavfilter/vf_ass.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Sep 9, 2012
  1. @michaelni

    ffmpeg_filter: fix unsafe snprintf() usage

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Sep 1, 2012
  1. @michaelni

    avoid ambigous buffersink names

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 31, 2012
  1. @michaelni

    ffmpeg_filter: use avcodec_find_best_pix_fmt_of_2()

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 22, 2012
  1. ffmpeg: make decoding_needed a counter.

    Nicolas George authored
Commits on Aug 20, 2012
  1. @michaelni

    Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

    michaelni authored
    * commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
      avconv: print info/capabilities options in a separate help group.
      avtools: add -h demuxer/muxer
      cmdutils: extend -h to allow printing codec details.
    
    Conflicts:
    	cmdutils.h
    	ffmpeg_filter.c
    	ffmpeg_opt.c
    	ffplay.c
    	ffserver.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 8, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (23 commits)
      build: cosmetics: Reorder some lists in a more logical fashion
      x86: pngdsp: Fix assembly for OS/2
      fate: add test for RTjpeg in nuv with frameheader
      rtmp: send check_bw as notification
      g723_1: clip argument for 15-bit version of normalize_bits()
      g723_1: use all LPC vectors in formant postfilter
      id3v2: Support v2.2 PIC
      avplay: fix build with lavfi disabled.
      avconv: split configuring filter configuration to a separate file.
      avconv: split option parsing into a separate file.
      mpc8: do not leave padding after last frame in buffer for the next decode call
      mpegaudioenc: list supported channel layouts.
      mpegaudiodec: don't print an error on > 1 frame in a packet.
      api-example: update to new audio encoding API.
      configure: add --enable/disable-random option
      doc: cygwin: Update list of FATE package requirements
      build: Remove all installed headers and header directories on uninstall
      build: change checkheaders to use regular build rules
      rtmp: Add a new option 'rtmp_subscribe'
      rtmp: Add support for subscribing live streams
      ...
    
    Conflicts:
    	Makefile
    	common.mak
    	configure
    	doc/examples/decoding_encoding.c
    	ffmpeg.c
    	libavcodec/g723_1.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/x86/pngdsp.asm
    	libavformat/version.h
    	library.mak
    	tests/fate/video.mak
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Something went wrong with that request. Please try again.