Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 14:58:51 +0000 (14:58 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:29:43 +0000 (15:29 +0000)
commit14a69ae60c64a071eb65a8521bf3c339322f5903
tree0fa0cc7b8958cecadff8fb6561b8fc4b2613115f
parent8c5092912b19e793412b07e070da2f8636c2c2f3
parentdc6527ed908e4d330738f139074455ffbe56a2de
Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'

FATE tests have been updated to patch. They do not differ in
any meaningful way.

* commit 'dc6527ed908e4d330738f139074455ffbe56a2de':
  nutenc: do not use AVCodecContext.frame_size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
19 files changed:
libavformat/nutenc.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