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: ac7d0c79c3f6
Choose a base ref
...
head repository: FFmpeg/FFmpeg
compare: 7ed9ec033f5f
Choose a head ref
  • 7 commits
  • 11 files changed
  • 5 contributors

Commits on Sep 27, 2012

  1. avformat: Identify anonymous AVIO typedef structs. 

    Anonymous typedef structs prevent forward declaration, this
change gives the AVIOContext and AVIOInterruptCB structures
a name.  These structures are now in line with other common
structures such as AVFormatContext and AVCodecContext.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
    @dalecurtis @DonDiego
    dalecurtis authored and DonDiego committed Sep 27, 2012
    Copy the full SHA
    0575772 View commit details
    Browse the repository at this point in the history

  2. Add Opus codec id and codec description. 

    Signed-off-by: Diego Biurrun <diego@biurrun.de>
    @daddesio @DonDiego
    daddesio authored and DonDiego committed Sep 27, 2012
    Copy the full SHA
    2a3d82a View commit details
    Browse the repository at this point in the history

  3. Add Opus support to the Ogg muxer. 

    Signed-off-by: Diego Biurrun <diego@biurrun.de>
    @saintdev @DonDiego
    saintdev authored and DonDiego committed Sep 27, 2012
    Copy the full SHA
    bcc1f7c View commit details
    Browse the repository at this point in the history

  4. avcodec: Drop long-deprecated imgconvert.h header

    @DonDiego
    DonDiego committed Sep 27, 2012
    Copy the full SHA
    0ae3ba8 View commit details
    Browse the repository at this point in the history

  5. nutdec: Remove unused and broken debug function stub

    @DonDiego
    DonDiego committed Sep 27, 2012
    Copy the full SHA
    8365544 View commit details
    Browse the repository at this point in the history

  6. dwt: Drop unused functions spatial_compose{53|97}i()

    @DonDiego
    DonDiego committed Sep 27, 2012
    Copy the full SHA
    4e5b7f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2012

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

    * qatar/master:
  dwt: Drop unused functions spatial_compose{53|97}i()
  nutdec: Remove unused and broken debug function stub
  avcodec: Drop long-deprecated imgconvert.h header
  Add Opus support to the Ogg muxer.
  Add Opus codec id and codec description.
  avformat: Identify anonymous AVIO typedef structs.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/imgconvert.h
	libavcodec/version.h
	libavformat/oggenc.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
    @michaelni
    michaelni committed Sep 28, 2012
    Copy the full SHA
    7ed9ec0 View commit details
    Browse the repository at this point in the history