← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavcodec/aac_ac3_parser.c

Committer: Bazaar Package Importer
Author(s): Reinhard Tartler
Date: 2009-03-13 09:18:28 UTC
mfrom: (1.1.8 upstream)
Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv

Tags: 3:0.svn20090303-1ubuntu1+unstripped1

merge from ubuntu.jaunty branch

files added:
debian/patches/005_release_branch_changes.diff

doc/APIchanges

libavcodec/eatqi.c

libavcodec/libopenjpeg.c

libavcodec/mpegvideo_xvmc.c

libavcodec/pixdesc.c

libavcodec/pixdesc.h

libavcodec/vdpau.c

libavcodec/vp6dsp.c

libavcodec/x86/vp6dsp_mmx.c

libavcodec/x86/vp6dsp_mmx.h

libavcodec/x86/vp6dsp_sse2.c

libavcodec/x86/vp6dsp_sse2.h

libavcodec/xvmc.h

libavcodec/xvmc_internal.h

libavformat/asfdec.c

libavformat/asfenc.c

libavformat/audiointerleave.c

libavformat/audiointerleave.h

libavformat/flacdec.c

libavformat/flacenc.c

libavformat/flacenc.h

libavformat/gopher.c

libavformat/ncdec.c

libavformat/rm.c

libavformat/rtpdec.h

libavformat/rtpenc.h

libavutil/pixfmt.h

tools/patcheck

files removed:
debian/patches/020_visibility_patch

debian/patches/050_disable_faad_test.diff

debian/patches/51_dlopen_correct_libfaad_so.diff

libavcodec/vdpauvideo.c

libavcodec/xvmc_render.h

libavcodec/xvmcvideo.c

libavformat/asf-enc.c

libavformat/rtp_aac.h

libavformat/rtp_mpv.h

files modified:
.svnrevision

Changelog

MAINTAINERS

Makefile

README

cmdutils.c

cmdutils.h

configure

debian/README.upstream-upgrade

debian/changelog

debian/confflags

debian/control

debian/control.common

debian/control.ffmpeg

debian/control.ffmpeg-debian

debian/get-orig-source.sh

debian/patches/series

debian/rules

doc/ffmpeg-doc.texi

doc/ffplay-doc.texi

doc/general.texi

ffmpeg.c

ffplay.c

ffserver.c

libavcodec/4xm.c

libavcodec/Makefile

libavcodec/aac.c

libavcodec/aac.h

libavcodec/aac_ac3_parser.c

libavcodec/aac_ac3_parser.h

libavcodec/aac_parser.c

libavcodec/aacdectab.h

libavcodec/aactab.c

libavcodec/ac3_parser.c

libavcodec/ac3dec.h

libavcodec/ac3enc.c

libavcodec/adpcm.c

libavcodec/adxdec.c

libavcodec/adxenc.c

libavcodec/allcodecs.c

libavcodec/alpha/asm.h

libavcodec/arm/h264dsp_neon.S

libavcodec/arm/mathops.h

libavcodec/atrac3.c

libavcodec/audioconvert.c

libavcodec/avcodec.h

libavcodec/bfi.c

libavcodec/bfin/config_bfin.h

libavcodec/bfin/mathops.h

libavcodec/bitstream.h

libavcodec/bmp.c

libavcodec/cavs.c

libavcodec/cavs.h

libavcodec/cavs_parser.c

libavcodec/cavsdec.c

libavcodec/cavsdsp.c

libavcodec/celp_filters.c

libavcodec/cljr.c

libavcodec/cook.c

libavcodec/dpcm.c

libavcodec/dsputil.c

libavcodec/dsputil.h

libavcodec/dv.c

libavcodec/dvdsub_parser.c

libavcodec/dvdsubdec.c

libavcodec/eacmv.c

libavcodec/eatgq.c

libavcodec/eatgv.c

libavcodec/error_resilience.c

libavcodec/fft.c

libavcodec/flac.h

libavcodec/flacdec.c

libavcodec/gif.c

libavcodec/golomb.h

libavcodec/h263.c

libavcodec/h263dec.c

libavcodec/h264.c

libavcodec/h264.h

libavcodec/h264_parser.c

libavcodec/huffyuv.c

libavcodec/imgconvert.c

libavcodec/imgconvert.h

libavcodec/imgresample.c

libavcodec/indeo3.c

libavcodec/internal.h

libavcodec/interplayvideo.c

libavcodec/intrax8.c

libavcodec/libamr.c

libavcodec/libdiracdec.c

libavcodec/libdiracenc.c

libavcodec/libfaad.c

libavcodec/libschroedingerdec.c

libavcodec/libschroedingerenc.c

libavcodec/libspeexdec.c

libavcodec/libtheoraenc.c

libavcodec/libvorbis.c

libavcodec/lpc.c

libavcodec/mathops.h

libavcodec/mdct.c

libavcodec/mimic.c

libavcodec/mlpdec.c

libavcodec/motionpixels.c

libavcodec/mpc8data.h

libavcodec/mpeg12.c

libavcodec/mpeg12.h

libavcodec/mpeg4video_parser.c

libavcodec/mpegaudio_parser.c

libavcodec/mpegaudiodec.c

libavcodec/mpegvideo.c

libavcodec/mpegvideo.h

libavcodec/mpegvideo_enc.c

libavcodec/mpegvideo_parser.c

libavcodec/msmpeg4.c

libavcodec/msrledec.c

libavcodec/nellymoserenc.c

libavcodec/nuv.c

libavcodec/options.c

libavcodec/parser.c

libavcodec/pcm.c

libavcodec/pnm.c

libavcodec/pnmenc.c

libavcodec/qcelp_lsp.c

libavcodec/qdm2.c

libavcodec/qtrleenc.c

libavcodec/ra144.c

libavcodec/ra288.c

libavcodec/rawdec.c

libavcodec/resample.c

libavcodec/resample2.c

libavcodec/roqaudioenc.c

libavcodec/rv10.c

libavcodec/rv30.c

libavcodec/rv34.c

libavcodec/rv40.c

libavcodec/sparc/dsputil_vis.c

libavcodec/sparc/vis.h

libavcodec/svq3.c

libavcodec/tta.c

libavcodec/utils.c

libavcodec/vc1.c

libavcodec/vc1_parser.c

libavcodec/vcr1.c

libavcodec/vp3.c

libavcodec/vp56.c

libavcodec/vp6.c

libavcodec/wmaenc.c

libavcodec/wmv2dec.c

libavcodec/x86/cavsdsp_mmx.c

libavcodec/x86/cpuid.c

libavcodec/x86/dsputil_mmx.c

libavcodec/x86/dsputil_mmx.h

libavcodec/x86/dsputil_yasm.asm

libavcodec/x86/fft_mmx.asm

libavcodec/x86/h264_deblock_sse2.asm

libavcodec/x86/h264_idct_sse2.asm *

libavcodec/x86/h264dsp_mmx.c

libavcodec/x86/mathops.h

libavcodec/x86/x86util.asm

libavcodec/xsubdec.c

libavdevice/dv1394.h

libavdevice/v4l2.c

libavfilter/avfilter.h

libavfilter/avfiltergraph.c

libavfilter/avfiltergraph.h

libavfilter/graphparser.c

libavfilter/graphparser.h

libavformat/Makefile

libavformat/adtsenc.c

libavformat/allformats.c

libavformat/ape.c

libavformat/asf.c

libavformat/asf.h

libavformat/assdec.c

libavformat/avformat.h

libavformat/avidec.c

libavformat/avienc.c

libavformat/avio.c

libavformat/avio.h

libavformat/cutils.c

libavformat/dv.c

libavformat/electronicarts.c

libavformat/ffmdec.c

libavformat/flvdec.c

libavformat/gxfenc.c

libavformat/idcin.c

libavformat/internal.h

libavformat/ipmovie.c

libavformat/isom.c

libavformat/matroska.c

libavformat/matroska.h

libavformat/matroskadec.c

libavformat/matroskaenc.c

libavformat/metadata.c

libavformat/metadata.h

libavformat/metadata_compat.c

libavformat/mm.c

libavformat/mmf.c

libavformat/mov.c

libavformat/movenc.c

libavformat/mp3.c

libavformat/mpeg.c

libavformat/mpegts.c

libavformat/mpegtsenc.c

libavformat/mpjpeg.c

libavformat/mxf.c

libavformat/mxf.h

libavformat/mxfdec.c

libavformat/mxfenc.c

libavformat/nsvdec.c

libavformat/nutdec.c

libavformat/nutenc.c

libavformat/oggdec.c

libavformat/oggenc.c

libavformat/oggparsevorbis.c

libavformat/options.c

libavformat/r3d.c

libavformat/raw.c

libavformat/raw.h

libavformat/rdt.c

libavformat/rdt.h

libavformat/riff.c

libavformat/rl2.c

libavformat/rm.h

libavformat/rmdec.c

libavformat/rmenc.c

libavformat/rpl.c

libavformat/rtp.c

libavformat/rtp.h

libavformat/rtp_aac.c

libavformat/rtp_h264.c

libavformat/rtp_h264.h

libavformat/rtp_mpv.c

libavformat/rtpdec.c

libavformat/rtpenc.c

libavformat/rtpenc_h264.c

libavformat/rtsp.c

libavformat/rtsp.h

libavformat/sdp.c

libavformat/sierravmd.c

libavformat/swfenc.c

libavformat/txd.c

libavformat/utils.c

libavformat/wc3movie.c

libavutil/Makefile

libavutil/avutil.h

libavutil/base64.c

libavutil/base64.h

libavutil/common.h

libavutil/internal.h

libavutil/log.c

libavutil/mem.c

libpostproc/postprocess.h

libpostproc/postprocess_internal.h

libswscale/.svnrevision

libswscale/Makefile

libswscale/rgb2rgb.c

libswscale/rgb2rgb_template.c

libswscale/swscale-example.c

libswscale/swscale.c

libswscale/swscale.h

libswscale/swscale_altivec_template.c

libswscale/swscale_internal.h

libswscale/swscale_template.c

libswscale/yuv2rgb.c

libswscale/yuv2rgb_altivec.c

libswscale/yuv2rgb_mlib.c

libswscale/yuv2rgb_template.c

libswscale/yuv2rgb_vis.c

output_example.c

tests/audiogen.c

tests/libav.regression.ref

tests/rotozoom.c

tests/seek.regression.ref

tests/seek_test.c

tests/videogen.c

version.sh

vhook/fish.c

vhook/imlib2.c

vhook/ppm.c

Show diffs side-by-side

added added

removed removed

libavcodec/aac_ac3_parser.c

72

72

73

73

/* update codec info */

74

74

avctx->sample_rate = s->sample_rate;

75

if(s->codec_id)

76

avctx->codec_id = s->codec_id;

77

75

78

/* allow downmixing to stereo (or mono for AC-3) */

76

79

if(avctx->request_channels > 0 &&

77

80

avctx->request_channels < s->channels &&

Older »