Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FFmpeg/FFmpeg
base: 14fd34d73bb0
Choose a base ref
...
head repository: FFmpeg/FFmpeg
compare: 31ab1575e59e
Choose a head ref
  • 9 commits
  • 63 files changed
  • 4 contributors

Commits on Oct 1, 2012

  1. ac3dec: ensure get_buffer() gets a buffer for the correct number of c… 

    …hannels

If there is an error during frame parsing, but AVCodecContext.channels was
changed and AC3DecodeContext.out_channels was set previously, the two may not
match.

Fixes CVE-2012-2802
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable@libav.org
    @justinruggles
    justinruggles committed Oct 1, 2012
    Copy the full SHA
    56b6a43 View commit details
    Browse the repository at this point in the history

  2. smacker: read escape codes in single get_bits() call 

    Signed-off-by: Paul B Mahol <onemda@gmail.com>
    @richardpl
    richardpl committed Oct 1, 2012
    Copy the full SHA
    adc5539 View commit details
    Browse the repository at this point in the history

  3. Remove some silly disabled code.

    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    14d3e7a View commit details
    Browse the repository at this point in the history

  4. avformat: Remove non-compiling and/or silly commented-out printf/av_l… 

    …og statements
    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    11d4e92 View commit details
    Browse the repository at this point in the history

  5. avformat: Convert some commented-out printf/av_log instances to av_dlog

    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    72eaba5 View commit details
    Browse the repository at this point in the history

  6. avcodec: Drop some silly commented-out av_log() invocations

    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    6f6b031 View commit details
    Browse the repository at this point in the history

  7. avcodec: Drop silly and/or broken printf debug output

    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    9c6cf7f View commit details
    Browse the repository at this point in the history

  8. avcodec: Convert some commented-out printf/av_log instances to av_dlog

    @DonDiego
    DonDiego committed Oct 1, 2012
    Copy the full SHA
    1218777 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'qatar/master' 

    * qatar/master:
  avcodec: Convert some commented-out printf/av_log instances to av_dlog
  avcodec: Drop silly and/or broken printf debug output
  avcodec: Drop some silly commented-out av_log() invocations
  avformat: Convert some commented-out printf/av_log instances to av_dlog
  avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
  Remove some silly disabled code.
  ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

Conflicts:
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/mjpegdec.c
	libavcodec/motion_est_template.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/put_bits.h
	libavcodec/ratecontrol.c
	libavcodec/wmaenc.c
	libavdevice/timefilter.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/flvenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
    @michaelni
    michaelni committed Oct 1, 2012
    Copy the full SHA
    31ab157 View commit details
    Browse the repository at this point in the history