1. 28 Jun, 2012 13 commits
  2. 27 Jun, 2012 16 commits
  3. 26 Jun, 2012 11 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · b536e2fa
      Michael Niedermayer authored
      * qatar/master:
        avconv: add an assert to silence an uninitialized variable warning.
        avconv: shut up an uninitialized variable warning.
        avfiltergraph: shut up uninitialized variable warning.
        af_join: initialize a variable to shut up gcc warning.
        amix: fix format specifier for AVFilterLink.sample_rate.
        lavfi: make filters less verbose.
        mpc8: read APE tags.
        lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes
        libm: provide fallback definition for cbrtf() using powf()
        network: Don't redefine error codes if they already exist in errno.h
        configure: Check for sys/time.h
        network: Include unistd.h from network.h
        avconv: don't include vsrc_buffer.h, which doesn't exist anymore
        lavfi: reorder AVFilterLink fields.
        lavfi: reorder AVFilterContext fields.
        lavfi: reorder AVFilter fields.
        lavfi: reorder AVFilterBufferRef fields.
        lavfi: reorder AVFilterBuffer fields.
      
      Conflicts:
      	configure
      	libavcodec/v210dec.h
      	libavfilter/asrc_anullsrc.c
      	libavfilter/avfilter.h
      	libavfilter/buffersrc.c
      	libavfilter/src_movie.c
      	libavfilter/vf_aspect.c
      	libavfilter/vf_crop.c
      	libavfilter/vf_drawbox.c
      	libavfilter/vf_fade.c
      	libavfilter/vf_overlay.c
      	libavfilter/vf_pad.c
      	libavfilter/vf_scale.c
      	libavfilter/vsrc_color.c
      	libavformat/network.h
      	libavutil/libm.h
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      b536e2fa
    • Michael Niedermayer's avatar
      Merge commit '1961e46c' · 5916bc46
      Michael Niedermayer authored
      * commit '1961e46c':
        lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
        lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
        lavfi: use proper FF_API guards for different deprecated functions
        lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
        lavfi: remove disabled FF_API_SAMPLERATE64 cruft
        lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft
      
      Conflicts:
      	libavfilter/avfilter.c
      	libavfilter/avfilter.h
      	libavfilter/buffersrc.c
      	libavfilter/formats.c
      	libavfilter/graphparser.c
      	libavfilter/version.h
      	libavfilter/video.c
      	libavfilter/vsrc_buffer.h
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      5916bc46
    • Michael Niedermayer's avatar
      Merge commit 'a5e8c41c' · 052f4f85
      Michael Niedermayer authored
      * commit 'a5e8c41c':
        lavfi: remove 'opaque' parameter from AVFilter.init()
        mov: do not try to read total disc/track number if data atom is too short.
        avconv: fix -force_key_frames
        dxva2_h264: fix signaling of mbaff frames
        x86: fft: elf64: fix PIC build
      
      Conflicts:
      	ffmpeg.c
      	libavcodec/v210dec.h
      	libavfilter/asrc_anullsrc.c
      	libavfilter/buffersrc.c
      	libavfilter/src_movie.c
      	libavfilter/vf_drawtext.c
      	libavfilter/vf_fade.c
      	libavfilter/vf_overlay.c
      	libavfilter/vsrc_color.c
      	libavfilter/vsrc_testsrc.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      052f4f85
    • Anton Khirnov's avatar
      avconv: add an assert to silence an uninitialized variable warning. · c29c1a1b
      Anton Khirnov authored
      The warning silenced was:
      avconv.c: In function ‘opt_output_file’:
      avconv.c:3380:21: warning: ‘meta_out’ may be used uninitialized in this function [-Wuninitialized]
      avconv.c:3315:20: note: ‘meta_out’ was declared here
      c29c1a1b
    • Anton Khirnov's avatar
      avconv: shut up an uninitialized variable warning. · 74853ed3
      Anton Khirnov authored
      The warning silenced was:
      avconv.c: In function ‘configure_filtergraph’:
      avconv.c:603:8: warning: ‘ist’ may be used uninitialized in this function [-Wuninitialized]
      avconv.c:549:18: note: ‘ist’ was declared here
      74853ed3
    • Anton Khirnov's avatar
      avfiltergraph: shut up uninitialized variable warning. · 61d158c3
      Anton Khirnov authored
      The warning silenced was:
      libavfilter/avfiltergraph.c: In function ‘avfilter_graph_config’:
      libavfilter/avfiltergraph.c:500:13: warning: ‘best_idx’ may be used uninitialized in this function [-Wuninitialized]
      61d158c3
    • Anton Khirnov's avatar
      af_join: initialize a variable to shut up gcc warning. · fd2784c3
      Anton Khirnov authored
      The warning silenced was:
      libavfilter/af_join.c: In function ‘join_request_frame’:
      libavfilter/af_join.c:451:9: warning: ‘nb_samples’ may be used uninitialized in this function [-Wuninitialized]
      fd2784c3
    • Anton Khirnov's avatar
      amix: fix format specifier for AVFilterLink.sample_rate. · 422008ac
      Anton Khirnov authored
      It is a plain int now.
      422008ac
    • Anton Khirnov's avatar
      lavfi: make filters less verbose. · 1a49a169
      Anton Khirnov authored
      1a49a169
    • Anton Khirnov's avatar
      mpc8: read APE tags. · ce0a9756
      Anton Khirnov authored
      ce0a9756
    • Gavin Kinsey's avatar
      examples/filtering: fix packet memleak · 37b5959d
      Gavin Kinsey authored
      Free packets unconditionally after demuxing, and not only when the
      packets belong to a given stream.
      Signed-off-by: 's avatarStefano Sabatini <stefasab@gmail.com>
      37b5959d