Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:35:53 +0000 (14:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 12:35:53 +0000 (14:35 +0200)
commitd09793576760c3f6894007184875a158b7be2347
tree853ca99459c8c753293cb733f90932f61edddfdd
parent955b31a7513e924cce36e484dc098581290af9b6
parent41776ba9c0ebbb71394cefdf7dd1b243e6c852d5
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'

* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
  avconv: do not use the stream codec context for decoding

Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffmpeg_opt.c