Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:38:02 +0000 (02:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Dec 2012 01:38:02 +0000 (02:38 +0100)
commitaf4b1c02acf6923489d30349c4813a0d73b2f114
tree72ba1faae0a32c3850d8a15fc07f282fec06c33c
parent52b866471ec97dd03d92ad1df4c5bdba54f285c0
parent77bd1bc73a1946b0f0ce09a7cbb242a65e138d06
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c

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