Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:47:12 +0000 (17:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:47:12 +0000 (17:47 +0200)
commit2d70282254834b276ab5eea44dba694f98551c79
tree57c8bc8f4c248c001eca910f13c26cee3fcf8437
parent95398aa9499bfad3330b47001b7eb086c31b0cd6
parentd754ed41727b1fcbab335b510248a9758a73320c
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'

* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
  riffenc: take an AVStream instead of an AVCodecContext

Conflicts:
libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avienc.c
libavformat/nutenc.c
libavformat/riff.h
libavformat/riffenc.c