git.ffmpeg.org Git - ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Sun, 1 Jun 2014 12:35:53 +0000 (14:35 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Sun, 1 Jun 2014 12:35:53 +0000 (14:35 +0200)
commit	d09793576760c3f6894007184875a158b7be2347
tree	853ca99459c8c753293cb733f90932f61edddfdd	tree \| snapshot
parent	955b31a7513e924cce36e484dc098581290af9b6	commit \| diff
parent	41776ba9c0ebbb71394cefdf7dd1b243e6c852d5	commit \| diff

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 git repo