Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Aug 2012 14:32:44 +0000 (16:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Aug 2012 14:32:44 +0000 (16:32 +0200)
commit4abb88d7e84208d86750091b3ec9082767ca74c1
tree1bfe6c37efeaee8fda5bdcf2155e5294eba9c8ac
parent60924dfe5539d1f5ff29240f0995a15c23982b88
parent2bd67175c7e16c1f5da15c9e55ae6db4ab1d23fd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_hqdn3d: Don't declare the loop variable within the for loop
  huffyuv: update to current coding style
  huffman: update to current coding style
  rtsp: Free the rtpdec context properly
  build: fft: x86: Drop unused YASM-OBJS-FFT- variable

Conflicts:
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/huffman.c
libavcodec/huffyuv.c
libavcodec/x86/Makefile
libavfilter/vf_hqdn3d.c
libavformat/rtsp.c