eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-03-12 21:26:13 +01:00
parent 212b89f8b4 666fe5da47
commit d64b854075
4 changed files with 96 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/lavf-regression.sh
+1 -1
View File
@@ -99,7 +99,7 @@ do_lavf swf "" "-an"
fi
if [ -n "$do_ffm" ] ; then
do_lavf ffm "-ab 64k"
do_lavf ffm
fi
if [ -n "$do_flm" ] ; then