Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:04:10 +0000 (16:04 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 21 Apr 2016 15:04:17 +0000 (16:04 +0100)
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
  testprogs: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavdevice/timefilter.c
libavformat/rtmpdh.c
libavformat/rtmpdh.h
libavutil/des.c
libavutil/lls.c

Simple merge
Simple merge
Simple merge
diff --cc libavutil/des.c
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
- #include <inttypes.h>
+ #include <stdint.h>
  #include "avutil.h"
  #include "common.h"
  #include "intreadwrite.h"
diff --cc libavutil/lls.c
Simple merge