Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:38:11 +0000 (16:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Mar 2013 15:38:11 +0000 (16:38 +0100)
commit7fff5781b6a94fa6f29a1e508f5badbbecf35232
treefbe0bdabf6d302cf89d24002df7904a8f2dca899
parentb64077bebe1f29adb2e72af1d9382c35f73ae651
parente4a7b2177d14678ae240edcabaacfe2b14619b7b
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'

* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
  vf_showinfo: remove its useless init function
  AVOptions: fix using named constants with child contexts.

Conflicts:
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_showinfo.c
libavutil/opt.c