projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 98840ee)
Merge commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Sep 2012 12:44:05 +0000 (14:44 +0200)
* commit 'c7b610aa0b1bac47eea0056b13fe6e982b85844a':
  avopt: Explicitly store float/double option defaults in .dbl

Conflicts:
libavcodec/ac3dec.c
libavcodec/libx264.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c

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

No differences found
FFmpeg git repo