Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:26:29 +0000 (21:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:31:51 +0000 (21:31 +0200)
commit1e49439f04f4aeb45344e8753094d00ac4b1a5d6
tree621f7e9cdf461b997ef614f6c9c4c5657089e471
parentc01bcce4959a208a4f6b66fd527760ed45cd29bb
parent6656370b858329ca07a60a2de954d5e90daa0206
Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
ffmpeg.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
71 files changed:
ffmpeg.c
tests/ref/acodec/pcm-s16be_planar
tests/ref/acodec/pcm-s16le_planar
tests/ref/acodec/pcm-s24le_planar
tests/ref/acodec/pcm-s32le_planar
tests/ref/acodec/pcm-s8_planar
tests/ref/acodec/pcm-u16be
tests/ref/acodec/pcm-u16le
tests/ref/acodec/pcm-u24be
tests/ref/acodec/pcm-u24le
tests/ref/acodec/pcm-u32be
tests/ref/acodec/pcm-u32le
tests/ref/fate/ffprobe_compact
tests/ref/fate/ffprobe_csv
tests/ref/fate/ffprobe_default
tests/ref/fate/ffprobe_flat
tests/ref/fate/ffprobe_ini
tests/ref/fate/ffprobe_json
tests/ref/fate/ffprobe_xml
tests/ref/fate/filter-colormatrix1
tests/ref/fate/filter-colormatrix2
tests/ref/fate/filter-crop
tests/ref/fate/filter-crop_scale
tests/ref/fate/filter-crop_scale_vflip
tests/ref/fate/filter-crop_vflip
tests/ref/fate/filter-edgedetect
tests/ref/fate/filter-edgedetect-colormix
tests/ref/fate/filter-hue
tests/ref/fate/filter-idet
tests/ref/fate/filter-null
tests/ref/fate/filter-pad
tests/ref/fate/filter-pixdesc
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-crop
tests/ref/fate/filter-pixfmts-field
tests/ref/fate/filter-pixfmts-fieldorder
tests/ref/fate/filter-pixfmts-hflip
tests/ref/fate/filter-pixfmts-il
tests/ref/fate/filter-pixfmts-kerndeint
tests/ref/fate/filter-pixfmts-lut
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-pad
tests/ref/fate/filter-pixfmts-rotate
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-super2xsai
tests/ref/fate/filter-pixfmts-swapuv
tests/ref/fate/filter-pixfmts-tinterlace_merge
tests/ref/fate/filter-pixfmts-tinterlace_pad
tests/ref/fate/filter-pixfmts-vflip
tests/ref/fate/filter-pp
tests/ref/fate/filter-pp2
tests/ref/fate/filter-pp3
tests/ref/fate/filter-pp4
tests/ref/fate/filter-pp5
tests/ref/fate/filter-pp6
tests/ref/fate/filter-scale200
tests/ref/fate/filter-scale500
tests/ref/fate/filter-select
tests/ref/fate/filter-setdar
tests/ref/fate/filter-setsar
tests/ref/fate/filter-thumbnail
tests/ref/fate/filter-tile
tests/ref/fate/filter-vflip
tests/ref/fate/filter-vflip_crop
tests/ref/fate/filter-vflip_vflip
tests/ref/lavf/mkv
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-nut
tests/ref/seek/lavf-ogg