diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:01:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-10 04:03:17 +0200 |
| commit | b97b4b58a6e1ac595002b3e3f3469161771c6003 (patch) | |
| tree | 8c2833931fb16084f95bf0adf8317e1fa28aca12 /cmdutils.c | |
| parent | 67d441499a042edcfb0f8a120e6196d10b1d13db (diff) | |
| parent | a88ef93b4abbea9f18c8750113dc9e99931f2f8a (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
mpegaudiodec: group #includes more sanely
mpegaudio: remove #if 0 blocks
ffmpeg.c: reset avoptions after each input/output file.
ffmpeg.c: store per-output stream sws flags.
mpegaudio: remove CONFIG_MPEGAUDIO_HP option
mpegtsenc: Clear st->priv_data when freeing it
udp: Fix receiving RTP data over multicast
rtpproto: Remove an unused variable
regtest: fix wma tests
NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT
regtest: separate flags for encoding and decoding
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index dd19bbffaf..38e152a4ad 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -84,6 +84,7 @@ void uninit_opts(void) } av_freep(&opt_names); av_freep(&opt_values); + opt_name_count = 0; } void log_callback_help(void* ptr, int level, const char* fmt, va_list vl) |