FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

History

Michael Niedermayer d64b854075 Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30':
  atomic: Exclude the unsupported implementation headers from checkheaders
  avconv: do not silently ignore unused codec AVOptions.

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-03-12 21:34:24 +01:00

fate

Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'

2013-03-12 21:15:21 +01:00

ref

Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

2013-03-12 15:57:28 +01:00

audiogen.c

…

base64.c

…

copycooker.sh