[FFmpeg-cvslog] Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

Derek Buitenhuis git at videolan.org
Sun Apr 10 22:22:47 CEST 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Apr 10 20:58:15 2016 +0100| [6f69f7a8bf6a0d013985578df2ef42ee6b1c7994] | committer: Derek Buitenhuis

Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis at gmail.com>
    - Hendrik Leppkes <h.leppkes at gmail.com>
    - wm4 <nfxjfg at googlemail.com>
    - Clément Bœsch <clement at stupeflix.com>
    - James Almer <jamrial at gmail.com>
    - Michael Niedermayer <michael at niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker at gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f69f7a8bf6a0d013985578df2ef42ee6b1c7994
---

 ffmpeg.c                                           |    9 +
 ffserver.c                                         |    4 +
 libavdevice/alsa.c                                 |    2 +-
 libavdevice/alsa_dec.c                             |   10 +-
 libavdevice/alsa_enc.c                             |   14 +-
 libavdevice/bktr.c                                 |   14 +-
 libavdevice/dshow.c                                |   49 +-
 libavdevice/fbdev_dec.c                            |   16 +-
 libavdevice/fbdev_enc.c                            |   12 +-
 libavdevice/gdigrab.c                              |    9 +-
 libavdevice/jack.c                                 |   10 +-
 libavdevice/lavfi.c                                |   32 +-
 libavdevice/libcdio.c                              |   12 +-
 libavdevice/libdc1394.c                            |   15 +-
 libavdevice/openal-dec.c                           |   12 +-
 libavdevice/opengl_enc.c                           |   16 +-
 libavdevice/oss_dec.c                              |    8 +-
 libavdevice/oss_enc.c                              |    4 +-
 libavdevice/pulse_audio_dec.c                      |    8 +-
 libavdevice/pulse_audio_enc.c                      |   25 +-
 libavdevice/sdl.c                                  |   32 +-
 libavdevice/sndio_dec.c                            |    8 +-
 libavdevice/sndio_enc.c                            |    4 +-
 libavdevice/v4l2.c                                 |   22 +-
 libavdevice/v4l2enc.c                              |   18 +-
 libavdevice/vfwcap.c                               |   35 +-
 libavdevice/x11grab.c                              |   17 +-
 libavdevice/xcbgrab.c                              |   11 +-
 libavdevice/xv.c                                   |   38 +-
 libavformat/3dostr.c                               |   20 +-
 libavformat/4xm.c                                  |   44 +-
 libavformat/a64.c                                  |   10 +-
 libavformat/aacdec.c                               |    6 +-
 libavformat/aadec.c                                |   22 +-
 libavformat/acm.c                                  |   20 +-
 libavformat/act.c                                  |   22 +-
 libavformat/adp.c                                  |   14 +-
 libavformat/ads.c                                  |   28 +-
 libavformat/adtsenc.c                              |    8 +-
 libavformat/adxdec.c                               |   30 +-
 libavformat/aea.c                                  |   20 +-
 libavformat/afc.c                                  |   16 +-
 libavformat/aiffdec.c                              |   90 +-
 libavformat/aiffenc.c                              |   50 +-
 libavformat/aixdec.c                               |   12 +-
 libavformat/amr.c                                  |   36 +-
 libavformat/anm.c                                  |   18 +-
 libavformat/apc.c                                  |   24 +-
 libavformat/ape.c                                  |   20 +-
 libavformat/apetag.c                               |    8 +-
 libavformat/apngdec.c                              |   66 +-
 libavformat/apngenc.c                              |   18 +-
 libavformat/aqtitledec.c                           |    4 +-
 libavformat/asfdec_f.c                             |   72 +-
 libavformat/asfdec_o.c                             |   30 +-
 libavformat/asfenc.c                               |   82 +-
 libavformat/assdec.c                               |    6 +-
 libavformat/assenc.c                               |   22 +-
 libavformat/astdec.c                               |   26 +-
 libavformat/astenc.c                               |   22 +-
 libavformat/au.c                                   |   30 +-
 libavformat/audiointerleave.c                      |   12 +-
 libavformat/avformat.h                             |   24 +-
 libavformat/avidec.c                               |  179 ++--
 libavformat/avienc.c                               |  160 ++--
 libavformat/avisynth.c                             |   60 +-
 libavformat/avr.c                                  |   18 +-
 libavformat/avs.c                                  |   12 +-
 libavformat/bethsoftvid.c                          |   24 +-
 libavformat/bfi.c                                  |   42 +-
 libavformat/bink.c                                 |   40 +-
 libavformat/bintext.c                              |   86 +-
 libavformat/bit.c                                  |   18 +-
 libavformat/bmv.c                                  |   20 +-
 libavformat/boadec.c                               |   12 +-
 libavformat/brstm.c                                |   60 +-
 libavformat/c93.c                                  |   10 +-
 libavformat/cafdec.c                               |   64 +-
 libavformat/cafenc.c                               |   50 +-
 libavformat/cdg.c                                  |    4 +-
 libavformat/cdxl.c                                 |   26 +-
 libavformat/chromaprint.c                          |    6 +-
 libavformat/cinedec.c                              |   34 +-
 libavformat/concatdec.c                            |   70 +-
 libavformat/dashenc.c                              |   62 +-
 libavformat/dauddec.c                              |   18 +-
 libavformat/daudenc.c                              |    4 +-
 libavformat/dcstr.c                                |   22 +-
 libavformat/dfa.c                                  |   12 +-
 libavformat/dsfdec.c                               |   22 +-
 libavformat/dsicin.c                               |   26 +-
 libavformat/dss.c                                  |   20 +-
 libavformat/dtshddec.c                             |    6 +-
 libavformat/dump.c                                 |   47 +-
 libavformat/dv.c                                   |   28 +-
 libavformat/dvenc.c                                |   47 +-
 libavformat/dxa.c                                  |   20 +-
 libavformat/eacdata.c                              |   12 +-
 libavformat/electronicarts.c                       |   34 +-
 libavformat/epafdec.c                              |   16 +-
 libavformat/ffmdec.c                               |   19 +-
 libavformat/ffmetadec.c                            |    4 +-
 libavformat/filmstripdec.c                         |   22 +-
 libavformat/filmstripenc.c                         |    6 +-
 libavformat/flac_picture.c                         |    8 +-
 libavformat/flacdec.c                              |   18 +-
 libavformat/flacenc.c                              |   18 +-
 libavformat/flic.c                                 |   48 +-
 libavformat/flvdec.c                               |  278 ++++---
 libavformat/flvenc.c                               |  190 ++---
 libavformat/framecrcenc.c                          |    8 +-
 libavformat/frmdec.c                               |   20 +-
 libavformat/fsb.c                                  |   94 +--
 libavformat/g722.c                                 |   16 +-
 libavformat/g723_1.c                               |   12 +-
 libavformat/g729dec.c                              |   18 +-
 libavformat/genh.c                                 |   84 +-
 libavformat/gif.c                                  |   28 +-
 libavformat/gifdec.c                               |    8 +-
 libavformat/gsmdec.c                               |   12 +-
 libavformat/gxf.c                                  |   82 +-
 libavformat/gxfenc.c                               |   66 +-
 libavformat/hdsenc.c                               |   14 +-
 libavformat/hls.c                                  |    4 +-
 libavformat/hlsenc.c                               |   18 +-
 libavformat/hnm.c                                  |   18 +-
 libavformat/icodec.c                               |   26 +-
 libavformat/icoenc.c                               |   46 +-
 libavformat/id3v2.c                                |    6 +-
 libavformat/id3v2enc.c                             |    2 +-
 libavformat/idcin.c                                |   34 +-
 libavformat/idroqdec.c                             |   36 +-
 libavformat/idroqenc.c                             |   13 +-
 libavformat/iff.c                                  |  160 ++--
 libavformat/ilbc.c                                 |   36 +-
 libavformat/img2dec.c                              |   46 +-
 libavformat/img2enc.c                              |   16 +-
 libavformat/internal.h                             |   22 +-
 libavformat/ipmovie.c                              |   36 +-
 libavformat/ircamdec.c                             |   16 +-
 libavformat/ircamenc.c                             |    8 +-
 libavformat/isom.c                                 |   38 +-
 libavformat/iss.c                                  |   30 +-
 libavformat/iv8.c                                  |    4 +-
 libavformat/ivfdec.c                               |   10 +-
 libavformat/ivfenc.c                               |   16 +-
 libavformat/jacosubdec.c                           |    6 +-
 libavformat/jacosubenc.c                           |    6 +-
 libavformat/jvdec.c                                |   24 +-
 libavformat/latmenc.c                              |   24 +-
 libavformat/libgme.c                               |    8 +-
 libavformat/libmodplug.c                           |   16 +-
 libavformat/libnut.c                               |   60 +-
 libavformat/lmlm4.c                                |    8 +-
 libavformat/loasdec.c                              |    4 +-
 libavformat/lrcdec.c                               |    4 +-
 libavformat/lrcenc.c                               |    8 +-
 libavformat/lvfdec.c                               |   26 +-
 libavformat/lxfdec.c                               |   34 +-
 libavformat/matroskadec.c                          |  141 ++--
 libavformat/matroskaenc.c                          |  302 +++----
 libavformat/mgsts.c                                |   12 +-
 libavformat/microdvddec.c                          |   12 +-
 libavformat/microdvdenc.c                          |   12 +-
 libavformat/mlvdec.c                               |   50 +-
 libavformat/mm.c                                   |   22 +-
 libavformat/mmf.c                                  |   28 +-
 libavformat/mov.c                                  |  488 +++++------
 libavformat/mov_chan.c                             |    4 +-
 libavformat/movenc-test.c                          |   36 +-
 libavformat/movenc.c                               |  866 ++++++++++----------
 libavformat/movenc.h                               |    2 +-
 libavformat/movenchint.c                           |   12 +-
 libavformat/mp3dec.c                               |    6 +-
 libavformat/mp3enc.c                               |   22 +-
 libavformat/mpc.c                                  |   16 +-
 libavformat/mpc8.c                                 |   16 +-
 libavformat/mpeg.c                                 |   24 +-
 libavformat/mpegenc.c                              |   36 +-
 libavformat/mpegts.c                               |  170 ++--
 libavformat/mpegtsenc.c                            |  153 ++--
 libavformat/mpjpegdec.c                            |    4 +-
 libavformat/mpl2dec.c                              |    4 +-
 libavformat/mpsubdec.c                             |    4 +-
 libavformat/msf.c                                  |   30 +-
 libavformat/msnwc_tcp.c                            |   10 +-
 libavformat/mtv.c                                  |   22 +-
 libavformat/musx.c                                 |   92 +--
 libavformat/mux.c                                  |  147 ++--
 libavformat/mvdec.c                                |   74 +-
 libavformat/mvi.c                                  |   34 +-
 libavformat/mxfdec.c                               |  134 +--
 libavformat/mxfenc.c                               |  130 +--
 libavformat/mxg.c                                  |   18 +-
 libavformat/ncdec.c                                |    4 +-
 libavformat/nistspheredec.c                        |   32 +-
 libavformat/nsvdec.c                               |   26 +-
 libavformat/nutdec.c                               |   46 +-
 libavformat/nutenc.c                               |   86 +-
 libavformat/nuv.c                                  |   66 +-
 libavformat/oggdec.c                               |    4 +-
 libavformat/oggenc.c                               |   80 +-
 libavformat/oggparsecelt.c                         |   14 +-
 libavformat/oggparsedaala.c                        |   24 +-
 libavformat/oggparsedirac.c                        |   30 +-
 libavformat/oggparseflac.c                         |   33 +-
 libavformat/oggparseogm.c                          |   56 +-
 libavformat/oggparseopus.c                         |   20 +-
 libavformat/oggparseskeleton.c                     |    2 +-
 libavformat/oggparsespeex.c                        |   20 +-
 libavformat/oggparsetheora.c                       |   28 +-
 libavformat/oggparsevorbis.c                       |   24 +-
 libavformat/oggparsevp8.c                          |    8 +-
 libavformat/omadec.c                               |   50 +-
 libavformat/omaenc.c                               |   28 +-
 libavformat/paf.c                                  |   22 +-
 libavformat/pcm.c                                  |   10 +-
 libavformat/pcmdec.c                               |   20 +-
 libavformat/pjsdec.c                               |    4 +-
 libavformat/pmpdec.c                               |   20 +-
 libavformat/psxstr.c                               |   34 +-
 libavformat/pva.c                                  |    8 +-
 libavformat/pvfdec.c                               |   14 +-
 libavformat/qcp.c                                  |   18 +-
 libavformat/r3d.c                                  |   26 +-
 libavformat/rawdec.c                               |   16 +-
 libavformat/rawenc.c                               |    4 +-
 libavformat/rawutils.c                             |   20 +-
 libavformat/rawvideodec.c                          |   14 +-
 libavformat/rdt.c                                  |    8 +-
 libavformat/realtextdec.c                          |   10 +-
 libavformat/redspark.c                             |   34 +-
 libavformat/riff.h                                 |    6 +-
 libavformat/riffdec.c                              |   94 +--
 libavformat/riffenc.c                              |  174 ++--
 libavformat/rl2.c                                  |   36 +-
 libavformat/rmdec.c                                |  118 +--
 libavformat/rmenc.c                                |   50 +-
 libavformat/rpl.c                                  |   72 +-
 libavformat/rsd.c                                  |   90 +-
 libavformat/rsodec.c                               |   14 +-
 libavformat/rsoenc.c                               |   14 +-
 libavformat/rtp.c                                  |   28 +-
 libavformat/rtp.h                                  |    8 +-
 libavformat/rtpdec.c                               |    6 +-
 libavformat/rtpdec_amr.c                           |    8 +-
 libavformat/rtpdec_asf.c                           |    6 +-
 libavformat/rtpdec_formats.h                       |    2 +-
 libavformat/rtpdec_g726.c                          |    6 +-
 libavformat/rtpdec_h264.c                          |   20 +-
 libavformat/rtpdec_hevc.c                          |   30 +-
 libavformat/rtpdec_ilbc.c                          |    6 +-
 libavformat/rtpdec_latm.c                          |    8 +-
 libavformat/rtpdec_mpeg12.c                        |    2 +-
 libavformat/rtpdec_mpeg4.c                         |   14 +-
 libavformat/rtpdec_qdm2.c                          |   24 +-
 libavformat/rtpdec_qt.c                            |    4 +-
 libavformat/rtpdec_svq3.c                          |   14 +-
 libavformat/rtpdec_xiph.c                          |   35 +-
 libavformat/rtpenc.c                               |   44 +-
 libavformat/rtpenc_aac.c                           |    2 +-
 libavformat/rtpenc_chain.c                         |    4 +-
 libavformat/rtpenc_h264_hevc.c                     |    4 +-
 libavformat/rtpenc_jpeg.c                          |   16 +-
 libavformat/rtpenc_latm.c                          |    2 +-
 libavformat/rtpenc_mpegts.c                        |    4 +-
 libavformat/rtsp.c                                 |   68 +-
 libavformat/samidec.c                              |    6 +-
 libavformat/sapdec.c                               |    4 +-
 libavformat/sauce.c                                |    8 +-
 libavformat/sbgdec.c                               |   26 +-
 libavformat/sdp.c                                  |  181 ++--
 libavformat/sdr2.c                                 |   16 +-
 libavformat/segafilm.c                             |   38 +-
 libavformat/segment.c                              |   22 +-
 libavformat/sierravmd.c                            |   54 +-
 libavformat/siff.c                                 |   28 +-
 libavformat/smacker.c                              |   58 +-
 libavformat/smjpegdec.c                            |   28 +-
 libavformat/smjpegenc.c                            |   26 +-
 libavformat/smoothstreamingenc.c                   |   42 +-
 libavformat/smush.c                                |   28 +-
 libavformat/sol.c                                  |   14 +-
 libavformat/soxdec.c                               |   28 +-
 libavformat/soxenc.c                               |   18 +-
 libavformat/spdifdec.c                             |   10 +-
 libavformat/spdifenc.c                             |    2 +-
 libavformat/srtdec.c                               |    4 +-
 libavformat/srtenc.c                               |    8 +-
 libavformat/stldec.c                               |    4 +-
 libavformat/subviewer1dec.c                        |    4 +-
 libavformat/subviewerdec.c                         |    8 +-
 libavformat/supdec.c                               |    4 +-
 libavformat/svag.c                                 |   24 +-
 libavformat/swf.h                                  |    2 +-
 libavformat/swfdec.c                               |   58 +-
 libavformat/swfenc.c                               |   94 +--
 libavformat/takdec.c                               |   20 +-
 libavformat/tedcaptionsdec.c                       |    4 +-
 libavformat/tee.c                                  |    6 +-
 libavformat/thp.c                                  |   23 +-
 libavformat/tiertexseq.c                           |   28 +-
 libavformat/tmv.c                                  |   40 +-
 libavformat/tta.c                                  |   14 +-
 libavformat/tty.c                                  |   10 +-
 libavformat/txd.c                                  |    4 +-
 libavformat/uncodedframecrcenc.c                   |    2 +-
 libavformat/utils.c                                |  615 +++++++++-----
 libavformat/v210.c                                 |   16 +-
 libavformat/vag.c                                  |   24 +-
 libavformat/vc1test.c                              |   10 +-
 libavformat/vc1testenc.c                           |   10 +-
 libavformat/version.h                              |    3 +
 libavformat/vivo.c                                 |   30 +-
 libavformat/voc_packet.c                           |   36 +-
 libavformat/vocdec.c                               |   25 +-
 libavformat/vocenc.c                               |   30 +-
 libavformat/vpk.c                                  |   30 +-
 libavformat/vplayerdec.c                           |    4 +-
 libavformat/vqf.c                                  |   42 +-
 libavformat/wavdec.c                               |   82 +-
 libavformat/wavenc.c                               |   52 +-
 libavformat/wc3movie.c                             |   30 +-
 libavformat/webm_chunk.c                           |    6 +-
 libavformat/webmdashenc.c                          |   62 +-
 libavformat/webpenc.c                              |   10 +-
 libavformat/webvttdec.c                            |    4 +-
 libavformat/webvttenc.c                            |    4 +-
 libavformat/westwood_aud.c                         |   22 +-
 libavformat/westwood_vqa.c                         |   36 +-
 libavformat/wtvdec.c                               |   54 +-
 libavformat/wtvenc.c                               |   58 +-
 libavformat/wvdec.c                                |   12 +-
 libavformat/wvedec.c                               |   14 +-
 libavformat/wvenc.c                                |    2 +-
 libavformat/xa.c                                   |   18 +-
 libavformat/xmv.c                                  |  105 ++-
 libavformat/xvag.c                                 |   28 +-
 libavformat/xwma.c                                 |   58 +-
 libavformat/yop.c                                  |   40 +-
 libavformat/yuv4mpegdec.c                          |   16 +-
 libavformat/yuv4mpegenc.c                          |   39 +-
 tests/api/api-band-test.c                          |    9 +-
 tests/api/api-h264-test.c                          |    9 +-
 tests/api/api-seek-test.c                          |    9 +-
 tests/fate/vpx.mak                                 |    4 +-
 tests/ref/fate/concat-demuxer-extended-lavf-mxf    |    2 +-
 .../ref/fate/concat-demuxer-extended-lavf-mxf_d10  |    2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf     |    2 +-
 tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 |    2 +-
 tests/ref/fate/concat-demuxer-simple2-lavf-ts      |    2 +-
 tests/ref/fate/ffprobe_compact                     |    4 +-
 tests/ref/fate/ffprobe_csv                         |    4 +-
 tests/ref/fate/ffprobe_default                     |    4 +-
 tests/ref/fate/ffprobe_flat                        |    4 +-
 tests/ref/fate/ffprobe_ini                         |    4 +-
 tests/ref/fate/ffprobe_json                        |    4 +-
 tests/ref/fate/ffprobe_xml                         |    4 +-
 tests/ref/fate/movenc                              |   38 +-
 tests/ref/fate/xmv-demux                           |   28 +-
 tests/ref/lavf/ffm                                 |    2 +-
 tests/ref/seek/lavf-voc                            |   12 +-
 362 files changed, 6555 insertions(+), 6079 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=6f69f7a8bf6a0d013985578df2ef42ee6b1c7994


More information about the ffmpeg-cvslog mailing list