-
Michael Niedermayer authored
* qatar/master: doc/examples: misc Doxygen markup improvements Conflicts: doc/examples/muxing.c doc/examples/transcode_aac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
fba1592f
* qatar/master:
doc/examples: misc Doxygen markup improvements
Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>